Fix creating cluster with Vanilla 2.4.0 plugin

Fixes bug: #1342821

Change-Id: Id1499cf85b7dc84ea369bb718fd3ab63306dfe2b
Merge "Fix creating cluster with Vanilla 2.4.0 plugin"