Upgrade php to 5.4.31 and 5.5.15
Merge pull request #349 from GrahamCampbell/php

Upgrade php to 5.4.31 and 5.5.15
Merge branch 'master' into ha-feature-trusty

Conflicts:
	ci_environment/php/attributes/default.rb