WCM-188 Update bnd with mandatory imports