Clean up package.xmls (from hydro branch)
Minor spacing issues cleaned up (from Hydro)
Minor spacing issues cleaned up (from Hydro)
Clean up spacing and track odom
Clean up spacing and track odom in DWA (from Hydro)
YAML Fix (from Hydro)