reorder state watcher types
reorder state watcher types

... so that service-related watchers are all together, and follow the usual
watcher-type; change-type; watcher-implementation convention.

No behaviour changes whatsoever; got an IRC LGTM from rogpeppe.

R=
CC=
https://codereview.appspot.com/6405043

Altoros/juju-cloudsigma,bz2/juju,fwereade/juju,AdamIsrael/juju,AdamIsrael/juju,bogdanteleaga/juju,alesstimec/juju,mjs/juju,fwereade/juju,mhilton/juju,marcoceppi/juju,makyo/juju,frankban/juju,marcoceppi/juju,fwereade/juju,axw/juju,dimitern/juju,ericsnowcurrently/juju,dimitern/juju,bogdanteleaga/juju,anastasiamac/juju,macgreagoir/juju,dimitern/juju,tasdomas/juju,cmars/juju,Altoros/juju-vmware,perrito666/juju,anastasiamac/juju,mikemccracken/juju,Altoros/juju-cloudsigma,mjs/juju,frankban/juju,voidspace/juju,anastasiamac/juju,perrito666/juju,cherylj/juju,bogdanteleaga/juju,makyo/juju,jrwren/juju,wwitzel3/juju,voidspace/juju,bac/juju,fwereade/juju,mjs/juju,marcmolla/juju,ericsnowcurrently/juju,Altoros/juju-vmware,bz2/juju,cloud-green/juju,bac/juju,howbazaar/juju,mhilton/juju-juju,bz2/juju,frobware/juju,anastasiamac/juju,rogpeppe/juju,cmars/juju,mattyw/juju,howbazaar/juju,mikemccracken/juju,AdamIsrael/juju,kat-co/juju,davecheney/juju,dooferlad/juju,frankban/juju,frankban/juju-tmp,jrwren/juju,marcoceppi/juju,waigani/juju,frankban/juju-tmp,kat-co/juju,tych0/juju,anastasiamac/juju,alesstimec/juju,waigani/juju,cherylj/juju,mjs/juju,marcoceppi/juju,mattyw/juju,thomnico/juju,howbazaar/juju,bz2/juju,tsakas/juju,axw/juju,alesstimec/juju,frobware/juju,voidspace/juju,cmars/juju,voidspace/juju,perrito666/juju,ericsnowcurrently/juju,sinzui/juju,frankban/juju-tmp,frobware/juju,jrwren/juju,alesstimec/juju,mikemccracken/juju,kat-co/juju,mjs/juju,ericsnowcurrently/juju,frankban/juju-tmp,reedobrien/juju,bac/juju,davecheney/juju,ericsnowcurrently/juju,sinzui/juju,mhilton/juju,tsakas/juju,axw/juju,dimitern/juju,macgreagoir/juju,Altoros/juju-vmware,cloud-green/juju,cherylj/juju,thomnico/juju,mikemccracken/juju,cherylj/juju,mhilton/juju,mjs/juju,tsakas/juju,marcmolla/juju,macgreagoir/juju,mikemccracken/juju,rogpeppe/juju,mjs/juju,frankban/juju,howbazaar/juju,reedobrien/store,waigani/juju,bac/juju,tych0/juju,Altoros/juju-cloudsigma,perrito666/juju,mhilton/juju-juju,Altoros/juju-vmware,mattyw/juju,sinzui/juju,tych0/juju,dooferlad/juju,axw/juju,perrito666/juju,macgreagoir/juju,macgreagoir/juju,tsakas/juju,gabriel-samfira/juju,wwitzel3/juju,Altoros/juju-cloudsigma,sinzui/juju,makyo/juju,gabriel-samfira/juju,kat-co/juju,rogpeppe/juju,makyo/juju,wwitzel3/juju,marcmolla/juju,waigani/juju,cmars/juju,thomnico/juju,bogdanteleaga/juju,cloud-green/juju,davecheney/juju,mhilton/juju-juju,cloud-green/juju,davecheney/juju,marcmolla/juju,frankban/juju,tasdomas/juju,bac/juju,gabriel-samfira/juju,mhilton/juju,bz2/juju,wwitzel3/juju,reedobrien/juju,marcmolla/juju,reedobrien/juju,gabriel-samfira/juju,dooferlad/juju,dooferlad/juju,dooferlad/juju,tasdomas/juju,howbazaar/juju,mhilton/juju-juju,reedobrien/juju,reedobrien/juju,dimitern/juju,gabriel-samfira/juju,tych0/juju,tasdomas/juju,kat-co/juju,alesstimec/juju,axw/juju,thomnico/juju,mattyw/juju,AdamIsrael/juju