this patch fixes some regressions in the Amarisoft UE class, the config template, etc. that have been undetected bc we never executed tests with it. Change-Id: I397e675a4018acf3372a3b7e29fd864703b2b919