upstream CiviCRM 4.2.16

Change-Id: I0d92ab4be92fad370374cd12685248a18c30be70
Upgrade to CiviCRM 4.2.17 upstream

Change-Id: I575c9136511840aa14ffdcad3a9be73c7a281766
Merge contrib into HEAD

Conflicts:
	CRM/Contribute/xml/Menu/Contribute.xml

Change-Id: Ib785fc1150e576867052e1149ee7f69cf3f4b1e3