Merge branch 'master' of ssh://git.onelab.eu/git/build

diff --combined lxc-tags.mk
index 0007451,13ddde0..b537332
--- 1/lxc-tags.mk
--- 2/lxc-tags.mk
+++ b/lxc-tags.mk
@@@ -42,12 -42,12 +42,12 @@@ pcucontrol-GITPATH              := git:
  # omf-resctl now comes from yum and gem, no need for rvm-ruby anymore
  oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
  ###
 -bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.2-6
 +bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@master
  sliceimage-GITPATH              := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-10
  nodeimage-GITPATH               := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-4
  myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.3-3
  
  #
- sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-3.1-15
+ sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-3.1-18
  #
  tests-GITPATH                   := git://git.onelab.eu/tests.git@master

diff --combined onelab-tags.mk
index 804281a,ed55963..0d7fdfe
--- 1/onelab-tags.mk
--- 2/onelab-tags.mk
+++ b/onelab-tags.mk
@@@ -47,14 -47,14 +47,14 @@@ rvm-ruby-BRANCH                    := planetla
  rvm-ruby-GITPATH                := git://git.onelab.eu/rvm-ruby.git@rvm-ruby-1.22.9-1
  oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
  ###
 -bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.2-6
 +bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@master
  sliceimage-GITPATH              := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-10
  nodeimage-GITPATH               := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-4
  myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.3-3
  DistributedRateLimiting-GITPATH       := git://git.onelab.eu/distributedratelimiting.git@DistributedRateLimiting-0.1-1
  
  #
- sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-3.1-15
+ sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-3.1-18
  #
  # locating the right test directory - see make tests_gitpath
  tests-GITPATH                   := git://git.onelab.eu/tests.git@master