am 8c128abe: Merge "Remove newly added but deprecated master switch location setting methods." into klp-dev

* commit '8c128abe9c3a945e329f2a7ddf13b8ca879c81c4':
  Remove newly added but deprecated master switch location setting methods.