Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS

Fix the behavior of the add_flow.py script in monitoring mode:
if the shortest path computation fails, keep trying instead of
exiting.