Swap out egress for egress-bootstrap
Merge branch 'develop'