Merge pull request #6039 from desheikh/2.2.2-wip

help-block margin-top should also apply after a span.uneditable-input

docs/assets/css/bootstrap.css

@@ -1957,7 +1957,8 @@ legend + .control-group {
 
 .form-horizontal input + .help-block,
 .form-horizontal select + .help-block,
-.form-horizontal textarea + .help-block {
+.form-horizontal textarea + .help-block,
+.form-horizontal span.uneditable-input + .help-block {
   margin-top: 10px;
 }
 

less/forms.less

@@ -672,7 +672,8 @@ legend + .control-group {
   // And apply it only to .help-block instances that follow a form control
   input,
   select,
-  textarea {
+  textarea,
+  span.uneditable-input {
     + .help-block {
       margin-top: @baseLineHeight / 2;
     }