Merge patches for Demo
Datastore regex -  https://review.openstack.org/#/c/30822/
host stats - https://review.openstack.org/#/c/33100/

Change-Id: I57da9060422c15b25b53381e228a98ca214d97a0