Merge "Support recovering VM on the same host" into stable/brahmaputra
authorCarlos Goncalves <carlos.goncalves@neclab.eu>
Fri, 29 Jan 2016 11:11:52 +0000 (11:11 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 29 Jan 2016 11:11:52 +0000 (11:11 +0000)

Trivial merge