Fix around null etags that appear during migration
Merge pull request #539 from eric-wu/develop

Patch release to fix around null etags that appear during migration
Merge pull request #540 from eric-wu/develop

Merge down ACL patch from release-3