Bug 875917 - Add braces to an if which has braces on its else. r=sstangl
Bug 875910 - Trim trailing whitespace. r=sstangl