sync with corestar
Merge branch 'alt-abd' of github.com:seplogic/jstar into alt-abd