Merge "services/mgmt/device: further restrict devicemanager 'test mode' & extra logging"