#1158 Fixed FallbackProxyClientTest to expect a 302 from Google
Merge branch '1158'
#1158 Reverted revert and merged with master