Merge branch 'branch-2' of https://github.com/griddynamics/yhadoop-common into branch-2-gd

Conflicts:
	pom.xml