Add tomcat profile and module dependency
Merge commit 'b4f26b3eebce03a1bf0ceff3791782339056d211'