Merge for 6.1.7

[mahalakshme]

Need:

Related to this release: #1519
Added separate card since there were merge conflicts at AddressLevels related files. So moved this to separate card.

Acceptance criteria:

• Follow steps mentioned here for release 6.1.7
  --- Merge 6.1 to 7.0 branch (Changed this from master to 7.0, as merge was already done to 7.0 by another developer)
  --- No need to add release notes to avni product repo.
  --- No need to Add tags and update release tracker since there is a immediate release that's gonna follow.

[himeshr]

Merge 6.1 to 7.0 branch as decided at the end for repos server, client, models, webapp and etl, where 6.1 brach existed.
Merged rules-server 6.0 into 1.0, for some rwb ciconfig changes, no 6.1 branch there.
Other repos did not have 6.1 branch to merge from.