use randomized & restricted dirs for bootstrap
t Merge branch 'b1' into develop
use randomized & restricted dirs for bootstrap
Merge
Merge branch 'b1' into develop
use randomized & restricted dirs for bootstrap
Merge branch 'b1' into develop

Conflicts:
	salt/modules/lxc.py