Added null checks to whitespace trimming code to fix provisioning UI.
Changed comparison of snmpPrimary field so that it always uses the new getter.
Fixed system group typo in hwg.xml.
Merge remote-tracking branch 'origin/1.12'
Merge remote-tracking branch 'origin/master' into features/config-refactor