Merge changes I5851dd16,Id196307f into pi-dev

* changes:
  OMS: harden permission checks
  Add missing fields to OverlayInfo.hashCode