Get rid of ESRI baselayers for master branch, keep in wmplus