Update PHP 5.4 Branch to Latest Vagrant Changes

This pull request brings needed updates to the branch when using the latest version of Vagrant.

## Changes
- Merges changes from master into the branch.
- Fixes configuration differences between Apache 2.2 and 2.4.