Merge into fix for patch tracker item id 3386015; php lint errors