move over to use ReentrantLock / Condition, fix imports and remove forbidden API exclusion