Merge xsd-fu changes from schema-2012-06

Depends on https://github.com/openmicroscopy/openmicroscopy/pull/645

Code generation changes: licence boilerplate only.
Tested using https://trac.openmicroscopy.org.uk/ome/wiki/XsdFu with 2012-06 schema.