Merge "Add org.apache.mina as dependency to pom.xml" into stable-2.5