CDH manager-node flavor change

Change-Id: I699deb52a4908aca0135a7d4eb8daf8b5d00aa68
Closes-bug: #1360313
Merge "CDH manager-node flavor change"