Update formatting on 2.1.x with scalariform

For pull request validation.