Upgrade CiviCRM to 4.2.19 upstream

Change-Id: I1dc86c47206b9e1f2711aefd351784deb8668fc8
Merge "Upgrade CiviCRM to 4.2.19 upstream"