Updating to bskyb repositories.

THIS SOFTWARE CONTRIBUTION IS PROVIDED BY THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED
Changes required for the container firewalls.
Merge remote-tracking branch 'origin/bskyb-containerfirewalls' into bskyb/staging

Conflicts:
	.gitmodules
	packages/ruby
	src/cloud_controller_ng
	src/dea_next