RC: Fix Headers

Don't modify an ArrayList in its own for loop.

Change-Id: I96face5879df08e4337e5ee7a725d9aacac0228b
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1