Merge "conman: Make sure all directories monitored with inotify exist."