Merge "Fix pep8 violations in ForwardingManager"