Merge branch 'master' into 'BS-6898_Test_postgres_on_tomcat7'
Merge branch 'BS-6898_Test_postgres_on_tomcat7' into 'master'