Merged gnome energymanagement branch changes
Missing merge changes and a minor whitespace change
Add capability to enable LPE feature in device xml
Remove any comments in the service xml
Merge remote-tracking branch 'origin/cablelabs/energymanagement_merge' into cablelabs/master