Merge pull request #96 from avpatel/master

Sync mainline tree with xvisor-next tree for v0.2.5 release