Merge "Add config to display VM number as default number of CF" am: 3e26cb18fb
am: 9953542c3a

Change-Id: I93696ab322ca9a2edcbf03efeb33cbf9f6c6279a