Make pip-requires a little F18 friendlier

This change also aligns with Nova, so should be fine.

Change-Id: I4b16774e0f79d4cb7519fb831647e835f6ced57c
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
Only delete the flavors that the script will then replace.

Change-Id: I9e78a1f98c0ba8d449e127a415baac8c469389a3
Fixes: bug #1100365
Merge "Make pip-requires a little F18 friendlier"