Fix issues about missing zc.buildout egg
Merge pull request #25 from Metaswitch/egg_fixes

[Reviewer: Andy] Fix issues about missing zc.buildout egg
Further egg fixes
Merge pull request #26 from Metaswitch/egg_fixes

[Reviewer: Andy] Further egg fixes
Fix Jenkins build (hopefully)
Merge 'fix_jenkins' into dev