1106198 take two

r? kumar

You've already seen the first commit. The second commit explicitly turns it off OAUTH for the proxy, so that it won't try and do OAUTH between db and proxy. Although arguably it should. Until we support that it will raise an explicit error if someone tries to do that.