Merge branch 'kameleon2-dev' of github.com:oar-team/kameleon into kameleon2-dev
Merge branch 'kameleon2-dev' of git+ssh://scm.gforge.inria.fr//gitroot/kameleon/kameleon into kameleon2-dev