Adapting vhostmacros to SFA
Merge branch 'testmerge' of github.com:fp7-ofelia/ocf into testmerge