Merge "Add test for permission escalation after reboot." into oc-dev