Newton -> Queens FFU upgrade: upgrade_steps_playbook.yaml fails: The error was: error while evaluating conditional ((os_net_config_need_upgrade.stdout and os_net_config_has_config.rc == 0) and (step|int == 3)): 'dict object' has no attribute 'stdout'

TASK [Check yum for rpm-python present] *******************************************************************************************************************************************************************************************************
ok: [192.168.24.9]

TASK [Fail when rpm-python wasn't present] ****************************************************************************************************************************************************************************************************
skipping: [192.168.24.9]

TASK [Check for os-net-config upgrade] ********************************************************************************************************************************************************************************************************
skipping: [192.168.24.9]

TASK [Check that os-net-config has configuration] *********************************************************************************************************************************************************************************************
skipping: [192.168.24.9]

TASK [Upgrade os-net-config] ******************************************************************************************************************************************************************************************************************
fatal: [192.168.24.9]: FAILED! => {"failed": true, "msg": "The conditional check '(os_net_config_need_upgrade.stdout and os_net_config_has_config.rc == 0) and (step|int == 3)' failed. The error was: error while evaluating conditional ((os_net_config_need_upgrade.stdout and os_net_config_has_config.rc == 0) and (step|int == 3)): 'dict object' has no attribute 'stdout'\n\nThe error appears to have been in '/home/stack/tripleo-40rIhX-config/Controller/upgrade_tasks.yaml': line 711, column 5, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n- block:\n - name: Upgrade os-net-config\n ^ here\n"}

The 'Upgrade os-net-config' task relies on os_net_config_need_upgrade.stdout to evaluate the when condition but the os_net_config_need_upgrade only gets registered at step 3 https://github.com/openstack/tripleo-heat-templates/blob/master/puppet/services/tripleo-packages.yaml#L55-L58 so the 'Upgrade os-net-config' task fails at any other step different than 3 as the os_net_config_need_upgrade var is undefined.

Attaching the rendered playbook as well: http://paste.openstack.org/show/646503/