Move the tests from functionalnosetests

Move the tests from functionalnosetests under functional, so we no
longer have two seperate trees for functional tests. This also drops
the 'nose' name from the directory, so that it doesn't end up with
confusion if we move to testr. Further, since there are no longer two
test runs in .functests, it nows looks very close to the other two.

Change-Id: I8de025c29d71f05072e257df24899927b82c1382

.functests

@@ -4,12 +4,7 @@ SRC_DIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))")
 
 cd ${SRC_DIR}/test/functional
 nosetests --exe $@
-func1=$?
+rvalue=$?
 cd -
 
-cd ${SRC_DIR}/test/functionalnosetests
+exit $rvalue
-nosetests --exe $@
-func2=$?
-cd -
-
-exit $((func1 + func2))