Ensure pool is properly closed in onDown (JAVA-417).
Merge branch '2.0' into 2.1