Feedback style changes.
#MBL-10605
#MBL-10601
#MBL-10595
Merge branch 'develop' of https://github.com/Saleslogix/argos-sdk into develop
Less compile