Bug 839677 - Remove problematic gsm_msg_queue and use gsm_msgq instead