Merge "BUG-1384: YangStoreServiceImpl.refresh() should never block"