Extended cli/libcdmi to support keystone token, minor fixes (STOX-45)