Fixed errors with row ID in ManageAdmins table
Merge branch 'jag/fix-manageadmins' into 3.2

Conflicts:
	main/core/ChangeLog