Fixed bug in merge processor (for osgi) and updated osgi-client