Merge "Consistent clean up of failed installs." into lmp-dev