Fix current now battery healthd config name
Device tree cleanup and fixes