Include v2.1 azure service runtime and fix references