Merge "BUG-7608: use blueprint action-provider/action-service" into stable/boron