Added unique endpoint machine names for metro
Merge branch 'master' into Development
Added unique endpoint machine names for android
Added correlation for matching request to replies