CodeStyle Isis; Closes #3797
CodeStyle
CodeStyle Hathor. Closes #3796
CodeStyle
Merge remote-tracking branch 'upstream/staging' into jviewmodel