backout recent additions to v2.2.1
Merge branch 'dev'

Conflicts:
	src/BrockAllen.MembershipReboot.Ef/DbContextRoleRepository`1.cs
	src/BrockAllen.MembershipReboot/Repository/EF/DefaultMembershipRebootDatabase.cs
pickup missed merge items