Reverted merged changes breaking karaf distribution

Change-Id: I61fa5a9aa7c60fd0ac21c282ddf6b875cbd5084c
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>
Signed-off-by: Ed Warnicke <eaw@cisco.com>