merge dev_4_4 --exclude conflict needs-fixes broken

Repository: ome/scripts
Updating 3587c87..f1abf9e

Generated by OMERO-merge-4.4#110 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-4.4/110/)