[Sahara] Fixed cluster template creation

Change-Id: I52197d8149bc5a40747dee554f356a4dfa5591aa
Closes-Bug: #1364648
Merge "[Sahara] Fixed cluster template creation"