some clean up, put back things I took away by mistake at last cleaning

Conflicts:

	rootdir/etc/init.target.rc

Change-Id: Idcce625809eecb077b684eeb984d084e714be6dc