Restores migration broken by r8182 and removes default scope on Role (#9800).
Authored by: jplang 2011-12-14
Parent: [r8212]
Child: [r8214]