Checkstyle corrections.
Merge branch 'develop' of https://github.com/NPTricky/ccd-colon-colon into develop