Fix bogus mark-status-needed, merge-action-status
Fix mark-status-needed to be a special-purpose action-status-or, and not use an action-status-and that merge-action-status is. This was causing level escalation to wholly invalidate some actions and have them rebuild all the time. Fix merge-action-status which is a action-status-and; also fix its documentation. That is minor, but still.
Showing with 12 additions and 9 deletions