Merge "Config parameter map styling pass, 2" into master_vca_intg