am 8743d100: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '8743d1005f442d161d22feb0b495e67a2dc2f550':
  WAR for compiler crash on PhaseBeam.