Clean up naming to match  new conventions

Identity Service -> Identity

Change-Id: I3cd9d1d643e4a34da0ec607747e7efa31e537ef9
author: diane fleming
Update to clouddocs-maven-plugin 1.15

Change-Id: Id127c5d9e2ef96b9837f6ba656ea6764b2aaf98a
Merge "Clean up naming to match  new conventions"