Fixes for change of allowDiskUsage to allowDiskUse
Fixed breaking tests against 2.5.5, bumped release candidate, minor bug fixes
Merge branch '1.4' into 3.0
Updated TODO for driver