Merge "fuel, armband: Remove SALT_MASTER_IP param"