Merge "Run tomcat as onap user"