Merge major changes to the way device state is passed around Asterisk. The two