Fixes according to the feedback
Merge branch 'fb-YAHOO-286-trunk-gd' of github.com:/griddynamics/yhadoop-common into fb-YAHOO-286-trunk-gd