Merge "RIFT-15270: Drop downs not working for config-parameter-refs" into master_vca_intg