Fix CLI plugins to comply with PEP8 1.5.0
Fix OmeroPy CLI unit tests to comply with PEP8
Merge pull request #2212 from sbesson/rebased/dev_4_4/pep8_1.5.0

Pep8 1.5.0 (rebased onto dev_4_4)
Merge pull request #2175 from chris-allan/12097-socket-timeout

dev_4_4: Update upgrade check handling in OMERO.web
Add Permissions to manifest (required for webstart)

Also added Codebase (currently * allows running from anaywhere) and Application-Name (displayed in the webstart dialog, instead of the user-unfriendly classname)

Conflicts:
	components/insight/build/dist.xml
Add Trusted-Only:true to the Insight manifest.

See http://docs.oracle.com/javase/6/docs/technotes/guides/jweb/mixed_code.html#trusted_only
Don't sign the webstart jars by default.

We're going to be code-signing in a separate process, so this prevents jars being double-signed, once with the self-signed cert and once with a proper one.

The webstart-sign target is still there, so you can use `./build.py webstart-sign release-webstart`.
Add an external webstart signing script

Automatically run this script with the existing self-signed certificate as part of the standard docs/hudson/OMERO.sh build
merge dev_4_4 -D org: PR 2144 (Passes channel configuration to Make_Movie (see #12036))
merge dev_4_4 -D org: PR 2200 (Bugfix: Weird behaviour after switching users (rebased onto dev_4_4))
merge dev_4_4 -D org: PR 2238 (Webstart code-signing 4.4)
merge dev_4_4 -D org

Repository: openmicroscopy/openmicroscopy
Already up-to-date.

Merged PRs:
  # PR 2144 cneves 'Passes channel configuration to Make_Movie (see #12036)'
  # PR 2200 dominikl 'Bugfix: Weird behaviour after switching users (rebased onto dev_4_4)'
  # PR 2238 manics 'Webstart code-signing 4.4'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1020 hflynn '4.4.11 docs fixes' (status: error)
Updating d853f51..17f5076
Merged PRs (fast-forward):
  # PR 907 ctrueden 'Tell Eclipse to ignore gmaven-plugin configuration'
  # PR 930 hflynn 'Using correct redirect for 4 download page'
  # PR 936 hflynn 'Fixing IDL links'
  # PR 879 hflynn 'Updating TILL Photonics website link (rebased onto dev_4_4)'

Repository: ome/scripts
Updating bef5c0c..4e28e22
Merged PRs (fast-forward):
  # PR 74 sbesson 'Fix scripts to comply with PEP8 1.5.0 (rebased onto dev_4_4)'
  # PR 65 sbesson 'Drop --use-mirrors from .travis.yml (rebased onto dev_4_4)'

Merged PRs:
  # PR 67 cneves 'Allow passing extra channel rendering options to Make_Movie script (see ...'

Repository: openmicroscopy/ome-documentation
Updating ef59469..2250156
Merged PRs (fast-forward):
  # PR 668 hflynn 'Always link to latest 4 download page'
  # PR 662 hflynn 'Making 4.4 status as maintenance version clear'
  # PR 648 sbesson 'Drop --use-mirrors from .travis.yml (rebased onto dev_4_4)'
  # PR 641 hflynn 'Updating 4.4.x Demo server unavailable now'
  # PR 635 sbesson 'Document latest changes to the Homebrew OMERO formula'
  # PR 631 hflynn 'Changing Windows Ice download link to 3.4'

Generated by OMERO-4.4-merge-daily#487 (http://ci.openmicroscopy.org/job/OMERO-4.4-merge-daily/487/)