Merge "Only run GentleKill test as root"