Merge "Clean up init /proc/cmdline handling."