Private address allocation changes for edge - EUCA-8499

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