First merge of spirent branch. Missing a couple of files to do manually
final commit for spirent merge
last commit of spirent to add memory value 1024 by default
Adapting vhostmacros to SFA
Merge branch 'testmerge' of github.com:fp7-ofelia/ocf into testmerge