CRM-13318  revert part of Coleman's patch that breaks profile retrieval
remove a couple of unrequired lines from test
CRM-13234 call getfields less times & pass in variables that might affect it (profile_id & potentially later other ones)
Merge pull request #1612 from eileenmcnaughton/master

CRM-13318  revert part of Coleman's patch that breaks profile retrieval