Addressing issues/concerns in #11611

This resolves the concern for when the remote is changed.
It will enforce the branch tracking along with it to maintain consistent [green] state runs.