Fix hostnames in dockerfile (bug 1059718)
Merge pull request #2500 from muffinresearch/update-hosts-dockerfile

Fix hostnames in dockerfile (bug 1059718)
make zippy the default
Merge pull request #2501 from andymckay/reference-by-default

make zippy the default
ensure late updating of CSP (bug 1051784)