Merge branch 'hotfix-1.8.4'
Updated varnish and expire modules to newest recommended version.
Merge branch 'hotfix-1.8.5' into develop