CB-7656 Fixes list-devices and list-emulators commands

Fix for https://issues.apache.org/jira/browse/CB-7656