revert changes for OSGI (causes issues in Java6, see https://travis-ci.org/EXIficient/exificient-core/jobs/210546923)
revert changes for OSGI (causes issues in Java6, see https://travis-ci.org/EXIficient/exificient-core/jobs/210546923)

EXIficient/exificient-core,EXIficient/exificient-core