Backward-compatability fixes with a bit extra future-proofing in service...

...s

Enyo-DCO-1.1-Signed-off-by: Jason Robitaille <jason.robitaille@lge.com>