Fix neutron spec file for icehouse

Add if statements around new icehouse components

Change-Id: I76ad024bf2af5e94df4daf2ca6cf94f9f6661cd0
Merge "Fix neutron spec file for icehouse"