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