Organize imports and format according to Apache Felix code conventions

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@657742 13f79535-47bb-0310-9956-ffa450edef68
36 files changed