CRM-15296 pass financialType vars as well as contributionType to enable future deprecation

(these vars are seen by extension writers so we can't just change them).

Also minor tidy up on $contributionTypeId as use of $contributionTypeId as a sometimes valid variable is confusing & error-inducing. So setting it correctly once & using it