updated for jbds 6 release
Merge branch 'irooskov-master'