Bug 898379 - Restore kp_kwargs and env arguments. r=ahal