Ticket 47620 - Fix cherry-pick error for 1.3.2 and 1.3.1
    
    Description:  During the cherry-pick process I had to make some manual changes,
                  and there were two schedule_destroy() calls made which lead to
                  a dereferenced point.
    
    https://fedorahosted.org/389/ticket/47620
    
    Reviewed by: rmeggins(Thanks!)
    (cherry picked from commit 3ae6900d8269926a1da097e3818aa444137aa9d9)
    (cherry picked from commit 5d4ac7c8c5d48be0796cdbf2ae7b9c40460de18c)