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

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

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