Yet Another Revert And Hopefully The Last One

This reverts commit 7b3f3d01.

This reverts commit bfb4669a.

This reverts commit bf1bb980.

This reverts commit 320f0265.

This is okay for kvm case, where only one cert is requested only once.

This reverts commit 274f6d24.

Conflicts:
	stack/erp5.cfg

Some branch must have badly used squash commit. Maybe me.
I hate me.

Conflicts:
	CHANGES.txt
	component/apache-php/buildout.cfg
	component/gcc/buildout.cfg
	component/java/buildout.cfg
	component/slapos/buildout.cfg
	component/stunnel/buildout.cfg
	setup.py
	slapos/recipe/kvm/__init__.py
	slapos/recipe/lamp/__init__.py
	slapos/recipe/lamp/template/apache.in
	slapos/recipe/lamp/template/php.ini.in
	slapos/recipe/librecipe/__init__.py
	slapos/recipe/mysql/__init__.py
	software/davstorage/instance.cfg
	software/davstorage/software.cfg
	software/erp5/software.cfg
	software/kvm/software.cfg
	software/lamp-template/instance.cfg
	software/lamp-template/software.cfg
	software/mariadb/instance.cfg
	software/mariadb/software.cfg
	software/phpmyadmin/software.cfg
	software/slaprunner/software.cfg
	software/wordpress/instance.cfg
	software/wordpress/software.cfg

This reverts commit 8839941b.