Fixed errors and some bugs in the neutron_pluggin

Change-Id: Id8b531405bf35ce285333d61dfc56ddef0bf07c6
Merge "Fixed errors and some bugs in the neutron_pluggin"