[COOK-4490] - Fix minitest `apache_configured_ports` helper

Signed-off-by: Sean OMeara <someara@opscode.com>
[COOK-4491] - Fix minitest: escape regex interpolation

Signed-off-by: Sean OMeara <someara@opscode.com>
[COOK-4492] - Fix service[apache2] CHEF-3694 duplication

Signed-off-by: Sean OMeara <someara@opscode.com>
[COOK-4493] - Fix template[ports.conf] CHEF-3694 duplication

Signed-off-by: Sean OMeara <someara@opscode.com>
Merge branch 'master' of github.com:onehealth-cookbooks/apache2 into fix