Back ported, Encounter.patientId should be deprecated as it leads to
consistency problems - TRUNK-3769