Merge "Grant dumpstate hwservermanager list permission" into oc-dev