Upgrade to CiviCRM 4.2.17 upstream

Change-Id: I575c9136511840aa14ffdcad3a9be73c7a281766