Merge branch 'stable-2.15'

* stable-2.15:
  Update commons-io dependency

Change-Id: I8c71adfca8a11962adf6e5022be1270f6da1b506