GH #324 - Removing merge.
GH #117 - Use artificial username to make sec_base unique constraints happy.
Merge branch 'master' into support/2.0