[varnishcache/varnish-cache] fe0382: Integrate EXP_Touch() into sml_touch()

[Poul-Henning Kamp]

  Branch: refs/heads/master
  Home:   https://github.com/varnishcache/varnish-cache
  Commit: fe0382d73f68c7aec468e7d1481a85fcee1c3486
      https://github.com/varnishcache/varnish-cache/commit/fe0382d73f68c7aec468e7d1481a85fcee1c3486
  Author: Poul-Henning Kamp <phk at FreeBSD.org>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M bin/varnishd/cache/cache.h
    M bin/varnishd/cache/cache_expire.c
    M bin/varnishd/storage/storage_simple.c

  Log Message:
  -----------
  Integrate EXP_Touch() into sml_touch()