Review Recent Nigeria code changes after qa

[lindagcaba]

The following pull requests still need to be reviewed so that they are merged to nigeria branch, please assist: https://github.com/OpenSRP/opensrp-client-reveal/pull/1383 https://github.com/OpenSRP/opensrp-client-reveal/pull/1382 https://github.com/OpenSRP/opensrp-client-reveal/pull/1379 https://github.com/OpenSRP/opensrp-client-reveal/pull/1377 https://github.com/OpenSRP/opensrp-client-reveal/pull/1373 https://github.com/OpenSRP/opensrp-client-reveal/pull/1371 https://github.com/OpenSRP/opensrp-client-reveal/pull/1369 https://github.com/OpenSRP/opensrp-client-reveal/pull/1367 https://github.com/OpenSRP/opensrp-client-reveal/pull/1365 https://github.com/OpenSRP/opensrp-client-reveal/pull/1359 https://github.com/OpenSRP/opensrp-client-reveal/pull/1356 https://github.com/OpenSRP/opensrp-client-reveal/pull/1344 https://github.com/OpenSRP/opensrp-client-reveal/pull/1340 https://github.com/OpenSRP/opensrp-client-reveal/pull/1332 https://github.com/OpenSRP/opensrp-client-reveal/pull/1323