Fix uEnv.txt fixup, and support unique target-uEnv.txt

Signed-off-by: Charles Steinkuehler <charles@steinkuehler.net>