[ctford, nim] Pulled in fixes to functional test and Django patches from Uganda.