Enable https if we are being proxied
Ignore the upload dir
Merge branch 'gitignore-mods' to brink in new ignore statements
RAT-490843 allow source button in TinyMCE