Handle receiving an upstream Path header
Better detection logic
Fix up NPE
Update init.d to prevent looping
Use --alias correctly
Add the --bono-cluster argument
Route the bono cluster into the stack
Use the newly defined bono cluster as our Path
init.d update to supply the bono-cluster
Also do the same for sprout-cluster
UT fix
Be more specific about SBC roles
Merge remote-tracking branch 'origin/master' into handle-not-being-edge-proxy

Conflicts:
	sprout/stateful_proxy.cpp
Fix up potential NPE in failure arm
Merge pull request #220 from Metaswitch/handle-not-being-edge-proxy

Reviewer Mike - Handle not being edge proxy