BUG/API: .merge() and .join() on category dtype columns will now preserve category dtype#15321

jreback wants to merge 2 commits intopandas-dev:masterpandas-dev/pandas:masterfrom

jreback:merge_catjreback/pandas:merge_catCopy head branch name to clipboard