modules.lxc: keep http proxy for bootstrap
modules.lxc: add keep_env param to run_cmd
modules.lxc: str -> basestr
Change python asserts to unittest asserts
Merge pull request #14244 from rallytime/fix_cache_tests

Change python asserts to unittest asserts
Fix issue in dict comprehensition from #14158
Return ret, Fixes 04c685ee48, Refs #14158
Merge pull request #14247 from basepi/returnret14158

Return ret, Fixes 04c685ee48, Refs #14158
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.