compatibility with a future version of Hadoop
Merge branch 'enterprise'