Revert "Breaking up 6360: Simple karaf distro"

This reverts commit 845caac725424c84bf32b4e36c7b25490b4ab538.

Change-Id: I3c769ed0577751cd8a724e8ad6c39803924815a3
Signed-off-by: Ed Warnicke <eaw@cisco.com>