Changed color names to avoid conflicts
Merge branch 'develop' of https://github.com/eProsima/RTPS into develop