Merge "BUG 1082 Migrate sal-rest-connector to Async Data Broker API"