Merge branch...

Merge branch '6326-the-old-supann-2009-schema-is-still-in-our-source-and-should-be-removed' into 'dev'

Resolve "The old supann 2009 schema is still in our source and should be removed"

See merge request fusiondirectory/fd-plugins!1086