Updates to 2.6 Service docs

First few changes for Services in 2.6. 

More doc updates later in the week.
I'll make the fix to the CLI and come back to this.