Move upload varnish to a separate class, and inherit from varnish::two-tier

Change-Id: Ice81042fbc108600ca512977817f639015a39ac4