Merge "Remove filesmap addition to target files from qssi"