Marshal in XSD order
Fix issue with binder service where global bindings could be removed on undeploy
Prevent a NPE if source is null
Fix tests to use lookup rather than name