Fixing merge reversion related to mitaka feature L7 tempest tests

Issues:
Fixes F5Networks#383

Problem:
I reverted a bad merge (which I also made) and reverted changes related
to feature l7 tempest tests. Those changes need to be introduced to run
in nightly.

Analysis:
Added back the tox.ini file, the Makefile changes and the changes to
the tempest configuration and test scripts.

Tests:

systest/Makefile

@@ -103,7 +103,7 @@ functest_all: tlc-install tempest_tests-install
 tempest_11.5.4_overcloud:
 	export TEST_VE_IMAGE=os_ready-BIGIP-11.5.4.2.0.291.qcow2 ;\
 	export TEST_OPENSTACK_CLOUD=overcloud ;\
-	export TLC_FILE=$(TLC_FILE_DIR)/$${TEST_OPENSTCK_CLOUD}/tempest_ve_$${TEST_OPENSTACK_CLOUD}.tlc ;\
+	export TLC_FILE=$(TLC_FILE_DIR)/$${TEST_OPENSTACK_CLOUD}/tempest_ve_$${TEST_OPENSTACK_CLOUD}.tlc ;\
 	export RESULTS_DIR=$(MAKEFILE_DIR)/test_results/$(PROJECT)/$(PROJECT)_$(BRANCH)-$@ ;\
 	export TEST_SESSION=$@_$(BRANCH)_$(SUBJECTCODE_ID)_$(TIMESTAMP) ;\
 	$(MAKE) -C . tempest_tests
@@ -144,7 +144,7 @@ tempest_11.5.4_undercloud:
 	$(MAKE) -C . tempest_tests
 
 # Tempest Tests for 11.6.x undercloud VE deployment
-tempest_11.6.0_overcloud:
+tempest_11.6.0_undercloud:
 	export TEST_VE_IMAGE=os_ready-BIGIP-11.6.0.0.0.401.qcow2 ;\
 	export TEST_OPENSTACK_CLOUD=undercloud ;\
 	export TLC_FILE=$(TLC_FILE_DIR)/$${TEST_OPENSTACK_CLOUD}/tempest_ve_$${TEST_OPENSTACK_CLOUD}.tlc ;\