Organize imports, remove unused casts and remove trailing spaces - no other changes this time

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