Continue to fix neutron wadls

Change-Id: I9d43ed2333f701275772a484ce4791acdb4f9b42
author: diane fleming