am 3ac7f611: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '3ac7f61179a97898ca5235140ad01f196d7eb0ba':
  Fix support version.