More label changes for Ring Device and Lock Device.
Removed .tbd CSS class.
Merge pull request #146 from mozilla-services/more-label-fixes

More label changes for Ring Device and Lock Device.