FLUID-4877: Switching the mode API for Captionator to follow the spec.
Merge remote-tracking branch 'michelle/FLUID-4877'

* michelle/FLUID-4877:
  FLUID-4877: Switching the mode API for Captionator to follow the spec.