ARIES-1103: Use version from bundle or subsystem manifest. Add in appropriate type too

git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1590210 13f79535-47bb-0310-9956-ffa450edef68