remove failing whitespaces preparatory to fixing backport
fix double } in backport