Merge changes I81ab0a73,Ia66015b7

* changes:
  Allow compsvc to execute odrefresh
  Allow composd to run fd_server