[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14867: fixes for userCredentials, allows proper update of user with userCredentials (added merging, and ...