Merge branch 'osd-devel' into nfs-for-next