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
Fixing flake8 in ldap.
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
Refactor CLI prefs unit tests to use pytests capsys fixture

- Drop MockCLI to use CLI instance itself
- Use capsys to systematically check the sys.stdout and the sys.stderr
Fix flake8 for the clitest unit tests
Add test/unit/clitest to the directories to flake8 in .travis.yml
Use absolutepath for setuptools in setup.py
Add cleanup() methods to test_hdfstorage.py
Set the editable flag to false. (See #11716)
Reset the editable flag when selecting a new item.
Merge pull request #1821 from sbesson/cliunittest

Unit tests (CLI tests flake8 and Travis fix)
Merge pull request #1809 from joshmoore/ldap-flake-fixes

Fixing flake8 in ldap.
Merge pull request #1825 from jburel/edit-name

Edit name