Tuberculosis now rivals AIDS as leading cause of death: WHO