[EZP-22153] eZDemo install does not respect "leave data and do nothing in the db" selection
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'
Fix [EZP-22328] Inline doc in logfile.ini can lead to error in updateviewcount script
Merge pull request #878 from crevillo/EZP-22328

Fix [EZP-22328] Inline doc in logfile.ini can lead to error in updatevie...
Fixed EZP-20815: Enter key in setup wizard activates wrong action: back instead of next
Implemented merged injected-settings

"site.ini/ExtensionSettings/ActiveExtensions[]" = array( 'extension' )

Won't apply when getting a group, and is overridden by a non-merge
key (without []). Should support associative arrays as well.
Merge pull request #879 from ezsystems/ezp-20815_wizard_enter

Fixed EZP-20815: Enter key in setup wizard activates wrong action: back instead of next
EZP-22210: Syntax
EZP-22210: Refactored injected merge settings
EZP-22318: Allow to deactivate settings

This is needed to deactivate session cookie settings when running
through Symfony stack (session settings must not be altered in that
case)
Ignoring siteaccess cache and log sub-directories

needed if the siteaccess is not suffixed by "_site"
Merge pull request #857 from crevillo/EZP-22153

[EZP-22153] eZDemo install does not respect "leave data and do nothing i...
Merge pull request #882 from pitpit/patch-1

Ignoring siteaccess cache and log sub-directories...
EZP-22210: phpdoc

[skip ci]
Merge pull request #880 from ezsystems/EZP-22210-legacy_bundles

Implemented injected-merge-settings
Fix [EZP-22358]: SiteAccessRules setting doesn't work well in the Symfony Stack
EZP-22260: fix casting of remote_id
EZP-22260: always generate parent_remote_id