Reverted merged changes breaking karaf distribution