Cluster scaling bug fixing:

Fixes: bug #1203041

Change-Id: Ib1fae214f6b49262b60fd5326156560000552407