Allow editable=. for pip.install
Add unit test for event timeouts
rm unused import from zcbuildout state

salt/states/zcbuildout.py:41: [W0611(unused-import), ] Unused import re
Catch os.error instead of all Exceptions
Grains detection for LXC and fix error in disk.usage under Docker

I have modified the core grains detection routines where dragons often lay, so this should be reviewed carefully.

I have elected to set the LXC detection inside virtual_subtype for account for cases wherein a user might be running inside VirtualBox (as the tutorial for Docker leads one to do). Moreover, I also allow the virtualization detection to continue after LXC is detected, as I believe it may even be possibly for Xen and LXC to co-exist. (Though, let's be honest -- probably not recommended!)

Finally, disk.usage now correctly fails with a warning message and includes a work-around for gathering disk usage under Docker containers. This refs #8976.
Keep pid of salt CLI command from showing in status.pid output

When status.pid is executed by the salt-minion instance running on the
master, it also returns the pid of the salt CLI command, because the
search string matches. This commit adds another grep to the ps/grep/awk
one-liner, which filters out lines matching 'status.pid'.
Return False if the role creation fails (return value would be nonzero).  Fixes #8778.
Return False if the role update fails (return value would be nonzero).
Merge pull request #9026 from cro/develop

Return False if Postgres role create or role update fails.
Integration testing for #8976
Merge branch 'develop' into #8976

* develop:
  Integration testing for #8976
Don't run the #8976 tests on Windows.
small issue in libcloud, need to install from source for now
Be more liberal about the format of the key we are looking for.  (e.g. accept 'ssh-rsa AAB3NzaC... comment' as well as just 'AAB3NzaC...')
Merge pull request #9030 from cro/fix_8698

Be more liberal about the format of the key we are looking for.
Merge pull request #9029 from erjohnso/develop

Have to rely on source install of libcloud for now.
Pass through "env" in cmd.script

Fixes #9002.
Merge pull request #9027 from terminalmage/issue9002

Pass through "env" in cmd.script
Fix argument parsing for arguments containing pound signs

Passing these through yaml.safe_load() will result in the pound sign and
everything after it being interpreted as a comment. This commit stops
the argument from being passed through yaml.safe_load if it is a string
and contains a pound sign.
add test case for #8585