build.properties should override
Merge branch 'master' into 2.x
[hotfix] Correct phing instructions in read me
Merge branch '2.x' into 24297-ckeditor