Merge "Add DBAAS_NODE_COUNT configuration parameter"