Merged r10504:10528 from michaelld/fix_local_data_install into trunk. Trunk passes...