fix bug where brand new osds accidentally get reaped
Merge branch 'master' into grizzly