develop
Remove redundant "coding: utf-8" lines (#9786)
Send the opentracing span information to appservices (#16227)
Replace simple_async_mock with AsyncMock (#16180)