Don't release stream IDs when a query timeout
Merge branch '1.0' into 2.0

Conflicts:
	driver-core/CHANGELOG.rst
	driver-core/src/main/java/com/datastax/driver/core/Connection.java
generate an OSGI-compliant jar (bundle)
Merge branch '1.0' into 2.0