merge upstream 5817ba4f (was: Delete test user when done)

[buffstop]

Please name test users something with TEST and delete them when done testing. (we have two ari registrations :-) ) Be careful deleting users in production!

[ari-pep]

This was not really a test actually: this happens when the form cannot be completed for some reason, a new session is started or even when user edits details. (I think I suspected something with my firefox, so switched to chromium)

upstream addressed this by writing to the db not before the second view is completed - will see wether that commit can be merged into our codebase

[ari-pep]

man, would've been easier to rewrite that commit by hand instead of cherry-picking it