Bring in additional changes to the Role Test Framework
Bring in additional changes to the Role Test Framework

Merge commit '5c6298930c6717e3bc553842866c545106bf768e'

arista-eosplus/ansible-eos-vxlan,arista-eosplus/ansible-eos-vxlan