Merge "Correct inotify usage and fix strong count accounting error" into oc-dev