fixes #4954 plus updates for gcutil/v1beta16 tests
Merge pull request #4971 from erjohnso/devel

fixes #4954 plus updates for gcutil/v1beta16 tests