CRM-17425 initial changes for pcp in contrib batch entry