Align the versions in the definition with those in the bom
Merge branch '1.0.x' into 1.1.x