am a2ccae25: Merge "avoid // in copy headers rule" into klp-dev

* commit 'a2ccae2546db082e571168650b279125bfceb861':
  avoid // in copy headers rule