Minor spaces fixes when replacing charcters -refs #6785
manual merge