Minor tidy-up
Merge branch 'master' of https://github.com/arjuna-technologies/GeoTools_DataBroker_PlugIn