CRM-18368 preliminary tidy-up, standarise setting of contributionStatusID