Various updates for recovery

Conflicts:

	config/init.recovery.rc