reverted changes in commit 96109d3 which seemed to break conditional classes in striped tables (ignoring the comment above that the previous rules were needed for just this purpose)

fixes issue twbs/bootstrap#11728
Merge branch 'master' into pr/11750

Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css