code style fixes for #443
Merge remote-tracking branch 'nexcess/devel' into jv-customers