Clean up merge

Clean up some artifacts from the merge to match the `jessie` branch.
Keep the changes on master made with commits bfe6fe84 and e229c551.

group_vars/testing

 ###############################################################################
 
 # common
-common_timezone: 'Etc/UTC'
 domain: sovereign.local
 main_user_name: sovereign
 friendly_networks:

roles/common/files/etc_apache2_conf-available_ssl-stapling-cache.conf

-SSLStaplingCache shmcb:${APACHE_RUN_DIR}/stapling_cache(128000)

roles/mailserver/tasks/opendmarc.yml

 - name: Install OpenDMARC milter and related packages
-  apt: pkg={{ item }} state=installed update_cache=yes cache_valid_time=3600
+  apt: pkg={{ item }} state=installed update_cache=yes
   with_items:
     - mysql-server
     - python-mysqldb

roles/mailserver/tasks/z-push.yml

   tags:
     - dependencies
 
-- name: Enable imap module on Trusty
-  command: php5enmod imap
-  when: ansible_distribution_release == 'trusty'
-
 - name: Download z-push release
   get_url:
     url=http://download.z-push.org/final/2.1/z-push-{{ zpush_version }}.tar.gz