Merge "Grant CAP_SYS_NICE to processes that need it." into oc-dev