Nova config changes for icehouse

Change-Id: Ie78fd608a29ba81b0b51093e327461d352bfd3de