This adds DD4hep PR 1080 and the requisite backwards compatibility...
No changes between version 2 and version 2