modules.lxc: keep http proxy for bootstrap
modules.lxc: add keep_env param to run_cmd
modules.lxc: str -> basestr
Don't use dict comprehensions in Python 2.6, Refs #14158
Merge pull request #14248 from basepi/zypperfix14158

Don't use dict comprehensions in Python 2.6, Refs #14158
Set the no refresh value in another catch point
Make sure test_grain passes with raet
Don't load module if zypp is not present
Merge pull request #14251 from rallytime/remove_mixed_case

Don't load module if zypp is not present
Add timeouts to wait longer
Merge pull request #14253 from pass-by-value/matcher_test_raet_compat

Matcher test raet compat
Merge pull request #14198 from mgwilliams/lxc-keep-http-proxy

modules.lxc: keep http proxy for bootstrap
Allow raet libs to safely import salt.master
fix this better, don't use clean_proc from master.py.
Remove trailing whitespace
Merge pull request #14254 from rallytime/whitespace

Remove trailing whitespace
Bump version to 2014.7.0
Removed no_site_packages as it has been deprecated
Change "Helium" to 2014.7.0 in affected docs
Change more affected docs from Helium to 2014.7.0