Merge changes I9842369f,I44bfc119

* changes:
  Add dependency to commons-text
  Merge branch 'stable-2.15'