back to db.admin.url
Merge branch 'master-2.5' of https://github.com/dotCMS/dotCMS into master-2.5