1557 Ignore error when killing a process
Merge remote-tracking branch 'origin/master' into INKLESS-1557

* origin/master:
  1551: update capistrano in gemfile
  1551: fix version capistrano-karaf
  1551: update to capistrano-karaf 1.5
1557 Execute kill with sudo
1557 Put a try catch around the kill