Fix folsom -> grizzly role table migration issues (bug 1119789)

Change-Id: Id7e5b3354d9139afa0a69b283924f363847cef56
Merge "Fix folsom -> grizzly role table migration issues (bug 1119789)"