Merge "Add cmpv2Certificate flag, removed hyphens from config under postgres and...