am 0729ec54: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '0729ec54cdc856990366b401a117daec11c2dc97':
  JWQ63
  JWQ59D
  JWQ59C
  JWQ59B
  JWQ59
  JWQ58
  JWQ57
  JWQ56C
  JWQ56B
  JWQ56
  JWQ52D
  JWQ52C
  JWQ52B
  JWQ52
  JWQ51C
  JWQ51B