Merge "(bug 40124) allow arbitrary user preferences prefixed with 'userjs-'"