Conflicts:
	CHANGES.txt
	component/tar/buildout.cfg
	setup.py
	slapos/recipe/downloader.py
	slapos/recipe/gitinit.py
	slapos/recipe/librecipe/execute.py
	software/gitrepo/git-http-backend.cgi.in
	software/gitrepo/gitweb.cgi.in
	software/gitrepo/gitweb.conf.in
	software/gitrepo/httpd.conf.in
	software/gitrepo/instance-gitrepo.cfg
	software/gitrepo/software.cfg
	software/lxc/instance-lxc.cfg
	software/lxc/lxc.conf.in
	software/lxc/software.cfg

os.rename failed when it move the file across devices/mount-points.
shutil.move allow to rename/move a file from one physical device to
another.

Conflicts:
	setup.py

Wrong data has been uplodaded to shacache.

Because "gets is a security hole - use fgets instead" and this function is not
available anymore in recent environments.

Also depend on patch change, as it shall lead to recompilation.

(cherry picked from commit d01956ec)

Because "gets is a security hole - use fgets instead" and this function is not
available anymore in recent environments.

Also depend on patch change, as it shall lead to recompilation.
(cherry picked from commit 70859841)

This recipe was colliding with slapos.recipe.template
recipe.

Moreover, this is useless since slapos.recipe.template provide
the same functionality.