Add intranet settings for private files
Move alters to os and cp_content module, they should probably own these for transaparancy
Add new site types.
Just remove the filter now that it has been changed.
Merge pull request #4109 from openscholar/4084

First set of so called 'intranet' changes