Merge branch 'master' of https://lab.nexedi.cn/krruzic/slapos.package

Conflicts:
	playbook/roles/wendelin-standalone/files/request-wendelin
	playbook/wendelin-standalone.yml

playbook/wendelin-standalone.yml

@@ -4,9 +4,12 @@
 
   vars:
     software_release_url: https://lab.nexedi.cn/nexedi/slapos/raw/1.0.3/software/wendelin/software.cfg
+<<<<<<< HEAD
     startup_playbook_id: wendelin-standalone.yml
     playbook_name: wendelin
     request_instance_template: request-wendelin.j2
+=======
+>>>>>>> 754c2b4af77d43544ff5cb4112b6afc9875ea535
 
   roles:
     - standalone-shared