#HADOOP-9746 issue workaround
Merge pull request #287 from matfed/master

#HADOOP-9746 issue workaround