moved CreatingSystemUsersScope to constructors to handle upgrade #690

fixes #690
Merge branch 'bugfixes/tokumx-1.3'