Merge branch 'siplabs-KAZOO-3119'
Apply Quickcall fix.

Conflicts:
	applications/crossbar/src/crossbar.hrl
	applications/crossbar/src/modules_v1/cb_devices_v1.erl
	applications/crossbar/src/modules_v2/cb_devices_v2.erl
Merge branch 'quickcall-test' into dev