[ADD] remove validatorRate functions and make sure marking happens during

Test plan: This feels big, but besides the make test and automated smoke test I'm not sure how to test this more. Would appreciate any feedback/input here so feel free to nitpick.

This removes the validatorRate logic and ensures the marking functions all happen during the churn attempt.

Closes to #1185 (closed)

Note: By lining these up, this gets rid of the "Grace period" for new nodes. This means a new node is eligible for churn out on its first churn.