Consistent terminology for XX-as-a-Service

Also changed "Load-Balancing-as-a-Service" to Load-Balancer-as-a-Service

Change-Id: I078cd7b4ad7f9d25c908e2c334efacf8de907e4f
author: diane fleming
Merge "Consistent terminology for XX-as-a-Service"