Added a removeExecutor helper in the Master.

Review: https://reviews.apache.org/r/25565
Minor cleanups to the Master code.

Review: https://reviews.apache.org/r/25566