[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1461: Merge patient-branch with trunk part 2.