Fix User initial prerequisites creation

added 5 commits

• 49f03638...94a0fd34 - 4 commits from branch dev
• 0d4bf1fc - Fix User initial prerequisites creation

Compare with previous version

By Max van Deursen on 2018-06-15T12:55:59 (imported from GitLab project)

merged

By Max Pigmans on 2018-06-15T13:56:10 (imported from GitLab project)

mentioned in commit 88d3d848

By Max Pigmans on 2018-06-15T13:56:10 (imported from GitLab project)