2.3.3: Merge branch 'merge-2.1.3'

# Conflicts:
#	playbooks/all.yml
#	playbooks/roles/bahmni-endtb-batch/tasks/main.yml
#	playbooks/roles/bahmniapps/tasks/main.yml