porting master to release

@Praburaj @glennc 

Porting master to release since it was behind in terms of commits. Will be adding more updates to release branch later and merging to master for beta2
Sure this is just a port to bring release at par with master. I'll be merging kvm from dev branch to here once this PR is approved