18848 - Fixes for bugs in Characteristics Workspace

Pull requests for client and enyo-x