Updates for Silverstripe 5.x#30

edwilde merged 2 commits intomadmatt:mainmadmatt/silverstripe-encrypt-at-rest:mainfrom

silverstripeltd:feature/silverstripe-5.x-compatibilitysilverstripeltd/silverstripe-encrypt-at-rest:feature/silverstripe-5.x-compatibilityCopy head branch name to clipboard