Add Nodes screen fix

Closes-Bug: #1273657

Change-Id: I60ecfe33783a8e65168ec2cad383b1e26b0937d7
Cluster name fix

Closes-Bug: #1273660

Change-Id: I50c1e0f7c75ef5f428e814bcc30925224a798194
Merge "Cluster name fix"