Bz 969223

Reissued pull request to upstream from https://github.com/gluster/hadoop-glusterfs/pull/45