ENTESB-799 - Update ops4j swissbox and base to match karaf