* commit '21d15b6cfc4a48e144c843eee9172fb9fe1b83c4': Remove newly added but deprecated master switch location setting methods.
* commit '21d15b6cfc4a48e144c843eee9172fb9fe1b83c4': Remove newly added but deprecated master switch location setting methods.