bug 971032 - apply environment arguments more consistently in Makefile

reword some of the environment variables in the makefile so that
what can be reused between unit and integration tests is reused.

tentative fix for bug 971032