add support for lxc 1.0 (deprecating < 1.0)
Initial alpha of the UXDRouter on the master
Clarify proxy log (not a problem in 99% of cases)
Check that known_hosts file is a real file before inserting into SSH config
A couple more brew tests
Merge pull request #10907 from mgwilliams/lxc1.0

add support for lxc 1.0 (deprecating < 1.0)
Merge pull request #10908 from basepi/proxylog

Clarify proxy log (not a problem in 99% of cases)
Merge pull request #10909 from joshk0/known_hosts_file_2

Check that known_hosts file is a real file before inserting into SSH con...
Merge pull request #10910 from rallytime/brew_test

A couple more brew tests
rm trailing whitespace from salt/states/file.py

************* Module salt.states.file
salt/states/file.py:954: [C0303(trailing-whitespace), ] Trailing whitespace
Merge pull request #10913 from cvrebert/patch-1

rm trailing whitespace from salt/states/file.py
Add uxdrouter and local cmd to the master flosrcipt
Lint fixes
Factor out payload_kwargs generation from the LocalClient.pub
Merge remote-tracking branch 'upstream/develop' into sam_raet_15

Conflicts:
	salt/daemons/flo/master.flo