Service token support [yoga]

[freyes]

Backports of pull requests listed below to get support for Service Tokens in charm-helpers' stable/zed branch.

• https://github.com/juju/charm-helpers/pull/740
• https://github.com/juju/charm-helpers/pull/757