Port ATLAS GEN and SIM to common bmk driver (BMK-139)
This was triggered by ATLAS SIM silent failuers in BMK-129