Fix DDL errors on install
Fix issues identified by Scrutinizr
Merge branch 'master' of github.com:LukeCarrier/moodle-local_cpd