Merge "updates to the instack VM"
authorTim Rozet <trozet@redhat.com>
Fri, 16 Oct 2015 17:13:37 +0000 (17:13 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 16 Oct 2015 17:13:37 +0000 (17:13 +0000)

Trivial merge