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

* commit '2df0464a54c1a4c2fca5814b07ee6d588617f2c4':
  avoid // in copy headers rule