Move distributions/extra/karaf to distributions/karaf

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