Fix node down processing and stale branch

Change-Id: Idb4e8df05c99a349118942725fefac70a8e1a318