Umm hack hack and hack....
Some hacks to make the code compatible to OSGI 5.x & Java 7.  
Used 
	Guava to provide Optional
	Simple ServiceFactory versus ServiceFactoryProxy ( OSGI 6 )
cleanup merge mess from local branch ...