Merge pull request #197 from vvaldez/openstack-terminate-enhancements

Add enhancements for for terminate playbook