preparing new navajo non-OSGi build