Revert most of "Nova config changes for icehouse"

This reverts commit 25c709a517b9cc391dd459254bac5d70b600765c.

This was breaking things.

Change-Id: I7d1a4774c270f46119ad0e96b23cd54ae4d8494d