Neutron fixes for ICE-HOUSE

Closes-Bug: #1305895
Closes-Bug: #1306084

Change-Id: If35dbef3121621d853798b371bf4aff495f2c68f
Merge "Neutron fixes for ICE-HOUSE"