More merge cleanup
merge: exclude net/boinc-client from masking