Skip test requiring mbstring when it's not installed
Merge remote-tracking branch 'sylvainfilteau/master'
Fix indenting, refs #2788