Add test for multi-line support in config load command
Add support for "config set --file FILE KEY"
Remove trailing whitespace from value set from file
Merge tag 'mainline_5_m002' into feature-omero-config-set-from-file

Merge point from upstream to be used for branch targeting

Conflicts:
	components/tools/OmeroPy/src/omero/plugins/prefs.py
Wrap long line
Fix URL for Homebrew install in the hudson shell script
Merge pull request #1812 from sbesson/homebrew_insntallation

Fix URL for Homebrew install in the hudson shell script
Merge pull request #1792 from knabar/feature-omero-config-set-from-file

develop: Add feature to load value for an individual setting from a file