Comment 6 for bug 1569884

I have applied this patch to testing and production because it resolves the issue for us.

I was going to make the base schema change and add my sign off, but I see that Steve has not signed off his latest branch.

Steve, could you add your signoff, please?