corrected import after the merge.
Tests corrected to pass after the merge.
Merge branch 'fb-HADOOP-9078-branch-2-gd' of https://github.com/griddynamics/yhadoop-common into fb-HADOOP-9078-branch-2-gd