Merge pull request #5 from ticketscript/TSP-4468

TSP-4468 synced latest changes from acceptance environment
Merge remote-tracking branch 'origin/TSP-4267' into TSP-4459

Conflicts:
	acceptance-amazon-rds-sync/reset-database-migration.sh
Merge pull request #2 from ticketscript/TSP-4459

TSP-4459 Setup nightly data dump-restore
Merge remote-tracking branch 'origin/master' into TSP-4849