Tweak maven metadata
Merge branch '2.5' into scape/execution-interface