python cli: change option short names core: fix ontology capability generation core+python: post rebase 'make gen' and fixes python/ontology - cleanup writer test/ontology: added proper marks and removed class test/ontology: added missing mark
