make bootstrap script retrieval customizable and configurable
tmpforshare
Merge remote-tracking branch 'remotes/origin/develop' into develop

Conflicts:
	salt/cloud/clouds/lxc.py
	salt/modules/lxc.py
	salt/modules/seed.py
	salt/runners/lxc.py