am d4340f89: Merge "Change Connections to allow setting conferenceable with...
am d4340f89: Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev
automerge: ce5a8e86
* commit 'ce5a8e86':
Change Connections to allow setting conferenceable with conferences.