Fix updateOrgPolicy function for context
Fix updateOrgPolicy function for context

This adds a loadSettings call to updateOrgPolicy so that we won't try to
change the settings when we are about to overwrite them with the
settings from storage.  We also switch the function to respect the class
scope.

uProxy/uproxy,uProxy/uproxy,uProxy/uproxy,uProxy/uproxy,uProxy/uproxy