Apply the DIRMINA-933 patch
Merge branch '2.0' of https://git-wip-us.apache.org/repos/asf/mina into 2.0