upstream CiviCRM 4.2.16

Change-Id: I0d92ab4be92fad370374cd12685248a18c30be70