18848 - Fixes for bugs in Characteristics Workspace

Pulls request for client and enyo-x.