Merge branch 'stable-2.15'

* stable-2.15:
  Fix dependencies in pom.xml
  Remove usless 'TODO' comment from workspace-status.sh

Change-Id: I6c4501861674a65422fc57cfcbcf73d424f277d5