Fixed bug in behaviors.

Change-Id: I9b3f647ecc5f76ab6f9e334c8da7c59fbb0cecf6
Adds addition Compute hypervisor/driver types

Change-Id: Ie7fd617d647acf4c186fbd83d2634b4ec033888f
Merge "Fixed bug in behaviors."
Merge "Adds addition Compute hypervisor/driver types"