Fix PubSub client conflict#1551

bgsouza wants to merge 2 commits intoGoogleCloudPlatform:masterGoogleCloudPlatform/python-docs-samples:masterfrom

bgsouza:patch-1bgsouza/python-docs-samples:patch-1Copy head branch name to clipboard