Upgrade apache2 cookbook to 3.0.0
Merge remote-tracking branch 'origin/dev' into dev