Fixed merge errors

- HTML identifier changes in master breaking tests
- Regression from b6b3cd98891e0f6134c77225e76147d8721d0129 in GridFieldSortableHeader (var capitalisation)