Roll object-storage version 0.12.22
Merge branch 'release/0.12.22' into develop