[UAA] fix issue with return in find_config_parameter
Merge branch 'registrar' into dev