cleanup, fixes

Enyo-DCO-1.1-Signed-off-by: Cole Davis <cole.davis@lge.com>
update to master with docs typo fix

Enyo-DCO-1.1-Signed-off-by: Cole Davis <cole.davis@lge.com>
ensure we're only modifying this on a per-instance basis...

Enyo-DCO-1.1-Signed-off-by: Cole Davis <cole.davis@lge.com>