Improve readability of swift::xfs

Improve readability of swift::xfs using ensure_packages
from the stdlib.

Change-Id: I9550c6e9415e49b5363e21c73c935390c3a635e3
Merge "Improve readability of swift::xfs"