Replace use of EntityWrapper with Entities for Dns and Msgs - EUCA-8867

EUCA-8867
Merge remote-tracking branch 'origin/dev/sjones/EUCA-8867' into testing