test fixes
Merge branch 'fb-YAHOO-261-trunk-gd' of github.com:griddynamics/yhadoop-common into fb-YAHOO-261-trunk-gd