Fixes #11801: use correct variables for grid containers
Merge branch 'master' of github.com:twbs/bootstrap