TEZ-1114. Fix encrypted shuffle. Contributed by Rajesh Balamohan.
Merge remote branch 'origin/apache-ref/master' into champlain