fix(collapse): ensure border property correctly disables bottom borde…

fix(collapse): ensure border property correctly disables bottom borde… #1734