Merge "Let users with SYSTEM permission set debug. properties" into jb-dev