am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit '8b4f4f6bb3acd40e4e554ab61e3b1166686775c1':
  sac template fixes