The task model rework has some migration ordering issues, this fixes that and ensures action migrations don't continue until other steps are done. Change-Id: I3c3669a12e5d5d6b11fdf0e49b14894468287b6a