make DefaultOrderedDict more sane
Add uxdrouter and local cmd to the master flosrcipt
Lint fixes
Add options '--force-color' and '--no-color' to salt-run
Add salt-run help to include new commands
```
  Output Options:
    Configure your preferred output format

    --no-color, --no-colour
                        Disable all colored output
    --force-color, --force-colour
                        Force colored output
```
Change device to estate to be consistent with new metaphor
Add initial support for user expiry via user state
renamed stack.devices to stack.estates
More refactoring rnaming
Factor out payload_kwargs generation from the LocalClient.pub
finished refactor rnaming device to estate and all vestiges
Fix gitfs regression

This was introduced when I added the gitfs whitelists feature recently.
If the base environment is requested, it will not be matched since the
branch name is passed to the _get_tree_* functions.
Added test for Yid being passed in matching next Yid
Added extra check to help make yard names unique
But not guaranateed
Make sure the util can import novaclient
Merge remote-tracking branch 'upstream/develop' into sam_raet_15

Conflicts:
	salt/daemons/flo/master.flo
run both tests by default
Merge pull request #10919 from SmithSamuelM/sam_raet_15

Sam raet 15 Some refactoring in preparation for more reliability in transactions
Add raet LocalClient - just starting
Comment all functions
Fix pep8 spacing