initial checkin for broker work.

initial checkin for broker work.
Updated code for broker support

Updated code for broker support
Addressed code review comments

Addressed code review comments
Addressed code warnings

Addressed code warnings
Resolved conflicts and pulled changes from dev

Resolved conflicts and pulled changes from dev
Merge pull request #223 from AzureAD/broker

Broker