Merge branch 'kvm'. Lot of conflicts.
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