Merge remote-tracking branch 'origin/TSP-4267' into TSP-4547

Conflicts:
	acceptance-amazon-rds-sync/migrate-database.sh
Merge remote-tracking branch 'origin/TSP-4267' into TSP-4547

Conflicts:
	acceptance-amazon-rds-sync/migrate-database.sh
Merge remote-tracking branch 'origin/develop' into TSP-4849