Merge remote-tracking branch 'origin/resiliency_annotated' into resiliency_annotated

Conflicts:
	stack/lamp/buildout.cfg

stack/lamp/buildout.cfg

@@ -64,7 +64,11 @@ recipe = hexagonit.recipe.download
 #If provided tarball does not containt top directory this option shall be changed to false
 strip-top-level-dir = true
 
-[instance]
+
+#----------------
+#-- Instance-level buildout profiles.
+
+[template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
@@ -131,8 +135,9 @@ md5sum = 53c9020f7a0b5203f976e069e455787b
 mode = 0644
 
 
+#----------------
+#-- Dummy parts in case no application configuration file is needed
 
-# Dummy parts in case no application configuration file is needed
 [application-template]
 filename =
 location =
@@ -140,6 +145,8 @@ location =
 [application-configuration]
 location =
 
+#----------------
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =