fix kernel branch, and revert to vsys-scripts trunk