Merge branch 'stretch_merge' of https://github.com/cliffe/SecGen into stretch_merge

modules/services/unix/database/mysql_stretch_compatible/mysql/mysql.pp

@@ -1 +1,2 @@
-include '::mysql::server'
+include '::mysql::server'
+include '::mysql::client'

modules/utilities/unix/web_frameworks/php_stretch_compatible/php/php.pp

@@ -1,3 +1,3 @@
-class { '::php':
-  apache_config => true,
-}
+ensure_packages(['php-mysql','libapache2-mod-php'])
+
+class { '::php': }