Comment 21 for bug 1202952

Keystone core: Could we get a review on Adam's patch ?
Anyone up for the Grizzly and Folsom backports ?