changes for ONOS-159 and ONOS-160

Change-Id: I7d8ebbf0c6668b2a47b2c74c931dd850a5f5796e
1 file changed