INF-115 added demo_vagrant and demo_firehost
Merge remote branch 'origin/master'; commit '4ab32b9994196c9171a623f1673026b4c4269f62'