OP-1299 Small changes proposed in review process.
OP-1299 uncrustify.