Migrating to CDH 5.2.0 and metrics which is built for CDH 5.2.0
Merge branch 'master' into jetty

Conflicts:
	pom.xml