Fix merge mishap#741

aozarov merged 17 commits intogoogleapis:gcs-niogoogleapis/google-cloud-java:gcs-niofrom

jean-philippe-martin:gcs-nio-fixjean-philippe-martin/gcloud-java:gcs-nio-fixCopy head branch name to clipboard