Merge "AAA-154 Make H2 database credentials configurable"