Fix finishing steps that are not top-level of any build

Created by  Eelco Dolstra  on June 18, 2015
NIXRSHRKEGTFYKVF3GF2TZO444PSVCB6AJJDPJWFZWE3OWRGOHUAC
Change contents