zc.buildout 3.0.1+slapos005: Fix some more bugs

Like with previous MRs, after merging these changes will be rebased in master to present a cleaner history of our patches. This has already been done in branch rebase/3.0.1_plus_slapos_005