Streamlining Karaf based container configuration and packaging.
Merge remote-tracking branch 'origin/master'