Merge "Update ansible before the ansible upgrade tasks" into stable/pike