HADOOP-18379 rebase feature/HADOOP-18028-s3a-prefetch to trunk

Fixes the build and a test failure (ITestS3ARequesterPays) which
was always there if you tested without prefetching enabled.

Change-Id: I4503c64856cfeb453b558808065b38455e1fce23
4 files changed