Fix merge issues.

Merged some discrepencies between ubc localOverrides and default
localOverrides.  Also removed a line that got duplicated for some reason
by the merge.