Remove incompatible properties.
add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs
Merge branch 'master' into pr/11744

Conflicts:
	dist/css/bootstrap.min.css