Merge branch 'master' of github.com:Appdynamics/hadoop-monitoring-extension

Conflicts:
	build.xml