Updated for JBDS 6 release

Need to apply irooskov changes to master into the 4.0.x branch too.