fix test failures

this commit is aimed at fixing gating test failures:

- add conditional statement so that openstack_dev_env can be tested
- fix dep failure

Change-Id: I29290fd448f39729d319412df470ff0eb6246333