[COOK-3417] Make Apache2 optional, and fix an issue with multiple distributions

https://tickets.opscode.com/browse/COOK-3417

Sorry for having these in the same pull-request - cherry-pick at will if anything looks suitable.