GPII-222: Removed hard-coded strings from templates and added them to the message bundle.
GPII-222: Changed the name of the label selector to be more consistent with established pattern. Fixed naming of toggle selector.
Merge remote-tracking branch 'jhung/GPII-222'

* jhung/GPII-222:
  GPII-222: Changed the name of the label selector to be more consistent with established pattern. Fixed naming of toggle selector.
  GPII-222: Removed hard-coded strings from templates and added them to the message bundle.