XXX rapid-cdn: Clean up instance-master.cfg.in

Cleanups:

 * dropped needless definition of aibcc_enabled
 * renamed master_partition_monitor_monitor_httpd_port to
   MASTER_PARTITION_MONITOR_HTTPD_PORT
 * convert buildout comments to Jinja2 comments
 * strip whitespaces, so that generated file is readable
 * correctly indent on Jinja2 not on buildout
 * drop obvious comments
 * minimize amount of variables, by dropping used only once
 * pass all modules with _module suffix
 * avoid passing needless software_type
 * group definition of all globals into one place
 * name all globals with UPPERCASE

XXX: Clean up until it will be possible to modify it a lot

software/rapid-cdn/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg.in
-md5sum = 15673a36048e2b181e421dd88f00d1b4
+md5sum = d84650302a01379345f5d6ad2e644780
 
 [profile-common]
 filename = instance-common.cfg.in
@@ -26,7 +26,7 @@ md5sum = a9332dbce01635cca8f8217a1fe49c44
 
 [profile-master]
 filename = instance-master.cfg.in
-md5sum = e757ae0579da03744df61491b97e7f03
+md5sum = ad8e670522ba4ff86e6944742e1f6dc5
 
 [profile-slave-list]
 filename = instance-slave-list.cfg.in

software/rapid-cdn/instance.cfg.in

@@ -98,14 +98,10 @@ extra-context =
     import subprocess_module subprocess
     import functools_module functools
     import operator_module operator
-    import validators validators
-    import software software
+    import validators_module validators
+    import software_module software
     key CLUSTER_DEFAULTS instance-default:defaults
     key SLAVE_DEFAULTS instance-slave-default:defaults
-# Must match the key id in [switch-softwaretype] which uses this section.
-# Keep RootSoftwareInstance for backward compatibility until all instances have
-# changed their software_type to default
-    raw software_type RootSoftwareInstance-default-custom-personal-replicate
 
 [dynamic-profile-kedifa]
 < = jinja2-template-base