Revert "Revert "Fix EZP-21966: eZUser now supports basic drafts""

This reverts commit ece8c52e0f18db1db71d23303d2f852aa647c663.
Reintroduces the user draft support patch.
Fixed regression: wizard sets password to publish

Fixes http://jira.ez.no/browse/EZP-22267.
Regression introduced in http://jira.ez.no/browse/EZP-21966.

Makes sure the userAccount object is applied to the dataMap
of the updated user content object before publishing.
Merge pull request #877 from ezsystems/EZP-22267-setup_wizard_password

Fix regression where setup wizard forces the password to 'publish'