Merge changes I128a894c,I3336c150

* changes:
  Remove use of locks in VcnGatewayConnection.
  Support Safemode for VCNs.