DM-8566: build related fixes#266

Merged

loitly merged 3 commits intodevfrom

DM-8566_build_fixes_tomcat8

Jan 9, 2017

Commits on Jan 7, 2017

DM-8566: build related fixes
loitly
committed

Commits on Jan 9, 2017