remove all buildout_* files to make things easier to understand/customize
Merge remote-tracking branch 'origin/remove_buildout_cfg_files' into develop
Wait a little bit longer for various services