Colleen feedback, round 2
Merge branch 'dck' of github.com:inetinteractive/inet-platform into dck