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

Change-Id: I8b9025467e1ebf9c74438eddbf1273fc53f3af53