logical neutron flow change PIC "quantum" > "neutron"

Change-Id: Ief5ad5c9ea8c797151f97cec63485be50b3b8cfd
Closes-Bug:#1275609
Merge "logical neutron flow change PIC "quantum" > "neutron""