artf609825: Framework-2:Device Id should display for Device deployment Not for simulator in functional test
Merge branch 'master' of https://github.com/phresco/framework