Merge "Apply post-upgrade step to not run puppet in post upgrade"