Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev