GCP-5842 (partial)
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware

# By Crisjaira Villarino (1) and others
# Via dennis
* 'master' of https://github.com/digitalabs/IBPMiddleware:
  GCP-4746
  testdatabaseConfig.prop is autogenerated, will be removed from repo
  GCP-5883
  GCP-5517, GCP-5595, GCP-4492