Merge pull request #541 from johngian/fix-monitoring

Fix monitoring config for apache/postgresql.

roles/monitoring/files/etc_monit_conf.d_apache2

-check process apache2 with pidfile /var/run/apache2.pid
+check process apache2 with pidfile /var/run/apache2/apache2.pid
   group www
   start program = "systemctl start apache2"
   stop program = "systemctl stop apache2"

roles/monitoring/files/etc_monit_conf.d_pgsql

-check process postgres with pidfile /var/run/postgresql/9.1-main.pid
+check process postgres with pidfile /var/run/postgresql/9.4-main.pid
   group database
   start program = "systemctl start postgresql"
   stop program = "systemctl stop postgresql"