Do not hard code changes to tomcat configuration file
Merge branch 'ME-519' into develop