feauture #3041: take out occi from main repo