Merge "Make indentation sane in init.rc"