Sort lines.
Remove redundant entry.
Fix  barracuda up waiting logic on CI instances.
Merge branch 'refs/heads/master' into 2.2.x-legacy