Arch Design: X-as-a-Service hyphens

Follow conventions on spelling X-as-a-Service, the guide used
a mixture of these spellings.

Change-Id: I5c334376654c49ea23b07189fcb8d3a917399d0e
Merge "Arch Design: X-as-a-Service hyphens"