Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
erlcloud_as:set_desired_capacity return val fix.

Spec said it returns {ok, string()} | {error, term()} where
the string is a scaling activity ID but it was only returning
the string, leading to bad matches.  Corrected to match the spec.