An Ansible performance issue has been found when a task that contains
iterable variables is included in a task that uses a higher level
conditional. This patch breaks the task out into individual tasks
to remove the delay.
Change-Id: Icc872a84a822dc0853a0a55d6913bf00a39c75c9