Set new_manifest to None to begin with, and an if was not indented
properly (thus changing the semantics in python).

Ticket #6886