PROV-924 Use locale code instead of ID for search form placement labels
Merge branch 'master-fix' into develop