Fixes identity configs for cloudkeep

Change-Id: Ib1eb1d706ee4fdf9b3cc4630a813ad2c8a2668da
Merge "Fixes identity configs for cloudkeep"