bootstrap line-height:1 needs to be overridden for tagsinput
support in keywords box
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x