Merge "poll umount completion from /proc/mounts" into oc-dev