changes for symphony 2.4
symfony 2.4 update
Merge branch 'feature/SBP-435' into develop