This is to fix bug 1079827. Please work.
This is to fix bug 1079827. Please work.

Change-Id: If94131d50b402170aa05e041cea74c3217045173

mmasaki/trove,zhangg/trove,redhat-openstack/trove,citrix-openstack/build-trove,redhat-openstack/trove,zhujzhuo/openstack-trove,citrix-openstack-build/trove,changsimon/trove,changsimon/trove,openstack/trove,citrix-openstack-build/trove,hplustree/trove,openstack/trove,fabian4/trove,mmasaki/trove,mmasaki/trove,citrix-openstack/build-trove,zhangg/trove,redhat-openstack/trove,hplustree/trove,cp16net/trove,zhujzhuo/openstack-trove,changsimon/trove,cp16net/trove,zhujzhuo/openstack-trove,fabian4/trove,denismakogon/trove-guestagent,citrix-openstack-build/trove,denismakogon/trove-guestagent,citrix-openstack/build-trove,fabian4/trove,cp16net/trove