Task: #3274 Patient.Contact.Period applied(again) and also Task: #3485 Patient Search Parameters for Organization and CareProvider were ambiguous. Changed names to rectify the situation

git-svn-id: http://gforge.hl7.org/svn/fhir/trunk/build@2997 2f0db536-2c49-4257-a3fa-e771ed206c19