back out changes for bug 58787: will replae BorderPropertyTemplate with a more general CellStyleTemplate in the future