I think because of the widespread use of the word for things wholly unrelated to social or race issues, it would be problematic to get rid of the term. I've always understood master=main or primary when it comes to master bedroom or master bath which is how it's meant in most contexts.
But if it offends too many people, I won't lose any sleep over it if it goes away. Just a word.