JENA-808 : Upgrades for composit graphs.  Remove deprecation.