Respond to CL13237049
Divide out BQ merge to datastore methods
Let dev oauth work by moving handlers to package handlers.
rtt: Don't mark same data merges as changed=true.