Get build running again. Upgrade to Varnish 4.

omnibus-software had to be rolled back, since the current version from
git isn't compatible with the released version of omnibus.