Renaming all patches to new format. Leaving UPDATE ... 'sqlpatch' in place for now.
Changing order of patch checking. The filename patch number is used by preference, falling back to the UPDATE SQL if not appropriate.
Merge branch 'dev' into dev-db
Merge branch 'dev-db' into dev
Updating Changelog.