Merge "Various updates needed to bump min php version to 5.3.2"