Miscellaneous Cluster Fixes

addresses a few minor issues raised after clusters was merged.

Change-Id: I2395e3a65efd1a8b9ec494fd59a0e2ee2009f59a
Closes-Bug: #1365767
Merge "Miscellaneous Cluster Fixes"