Merge branch 'stable-2.9' * stable-2.9: Fix double packaging of commons-io Change-Id: I0bcbbc2498fcf35edd9957e9c698e41f92f55fd5