Fixes for nova policy
Merge branch 'master' of github.com:fpatwa/sios