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

Conflicts:
	dev-support/test-patch.properties