Merge "cmd/mgmt/device/impl: Fix binserv and appserv"