ID: 3598093 

Original bug report for this problem:
http://sourceforge.net/p/oscarmcmaster/bugs/2090/

Basis from master:
https://source.oscartools.org:8080/5184

Change-Id: I598fe57192ee1e350b65b8251bbdfa4296f0480d
ID: 3598093 
Checkstyle

First part of this fix broke grid display:
https://source.oscartools.org:8080/#/c/6767/

Original bug report for this problem:
http://sourceforge.net/p/oscarmcmaster/bugs/2090/
Basis from master:
https://source.oscartools.org:8080/5184

Change-Id: I41c72cc9ae55de3529c487e566cecb5d22f270fa