Add bitronix.tm as resolution:=optional for OSGI MetaData
Merge remote-tracking branch 'origin/master'