VIVO-804: fix ordering of property groups
VIVO-805: fix i18n parameter issue on password length string