Codesniffer upgrade breaks on these two lines.
Unneeded breaks around throws.
Merge pull request #367 from jordandukart/7.x

Codesniffer upgrade breaks on these two lines.