Configure stable/grizzly

Change-Id: I53d5603bac55f400fc5b3fe6a9c59d7c9cce9ebc
Merge branch 'nova-clean' into dt-test