Fixes #2669 - stop services array from being reported smashed together

Change-Id: I74dfe1941eb338a89be994ac9e1b61739601d9db
lint hosts.pp

Change-Id: If10470978ee31a398e0b88d8d98552c93d4706a2
update apache submodule to get ssl no_default_site fix. I previously accidentally reverted this change

Change-Id: Iebc041cf6fb54b79d75eeabd27410ad953b8e340
Merge remote-tracking branch 'leap/develop' into develop