Merge tag 'md/3.17-more-fixes' of git://git.neil.brown.name/md