CB-6895 Add more config properties into manifest
Merge remote-tracking branch 'rodms/CB-6895'