Fix issue when authenticating with new password format
Fix bug with inserting duplicated versions of a template resource
Workaround for where invalid template files prevent appserver startup