Merge remote-tracking branch 'origin/master' into barrier-blockers

Conflicts:
	modules/OFStateManager/module/src/handlers.c
OFConnectionManager: add NULL-avoidance comments to cxn cookie
indigo: add comment to barrier blocker interface
indigo: wrap long lines