Merging two different sphinx repo's

Just trying to merge Vladimir's last changes.

We've come to having upstream repo (zerovm one) and Vladimir's local repo which have no common commits (things happen). So, now we're merging Vladimir's local repo changes into upstream. Don't even think about reviewing it.

Heavy testing is welcome.