Merge branch 'devel' #1828

Job	Run time
container_build (apache2, wsgi)	1m 2s
container_build (apache2, django)	1m 8s
container_build (nginx, wsgi)	54s
container_build (nginx, django)	1m 1s
lego_tests (rsa2048, apache2, wsgi)	44s
lego_tests (rsa2048, apache2, django)	44s
lego_tests (rsa2048, nginx, wsgi)	49s
lego_tests (rsa2048, nginx, django)	59s
lego_tests (rsa4096, apache2, wsgi)	1m 1s
lego_tests (rsa4096, apache2, django)	51s
lego_tests (rsa4096, nginx, wsgi)	50s
lego_tests (rsa4096, nginx, django)	58s
lego_tests (ec256, apache2, wsgi)	41s
lego_tests (ec256, apache2, django)	44s
lego_tests (ec256, nginx, wsgi)	45s
lego_tests (ec256, nginx, django)	49s
cleanup (apache2, wsgi)	2s
cleanup (apache2, django)	7s
cleanup (nginx, wsgi)	4s
cleanup (nginx, django)	2s
	14m 15s

Provide feedback