Use X-as-a-Service

Convert to new convention, add an entry for PaaS to the glossary.

Change-Id: Ie0ce977858e4c2659d207077e03ad85d8d088347
Merge "Use X-as-a-Service"