Updating test for set({}, mergeAll:true)#3115

pongad merged 3 commits intomastergoogleapis/google-cloud-java:masterfrom

mrschmidt-conformancefixgoogleapis/google-cloud-java:mrschmidt-conformancefixCopy head branch name to clipboard