Same changes as in https://github.com/getrailo/railo/pull/243, but without the "Merge remote branch 'Railo/4.1' into 4.1-admin-changes"
Merge pull request #246 from paulklinkenberg/4.1-admin-changes-2

4.1 admin changes 2