Use service tracker to detect file changes

This is an improvement for filebased discovery
Merge commit '44eb97c' into jander