Comment 38 for bug 1202952

So, to summarize... our patches for this are posted at:
master (havana): comment 7
grizzly: comment 29
folsom: comment 34

keystone-core please confirm and +2 proposed patches !