upstream CiviCRM 4.2.15

Change-Id: I26e41125db9abcba075a619e7c68bb1050284350