Conflicts:
	src/include/switch_core_media.h
	src/mod/endpoints/mod_sofia/sofia_media.c
	src/switch_core_media.c

FS-5530 --resolve this will make it identical to the bridge behaviour even when the bridge in early media begins and now you will explicitly need continue_on_fail=true in this situation to not fail

Fix applied to Punchblock here: https://github.com/adhearsion/punchblock/commit/cef5198e80b60e19fc949b21f6e0dc438cecc5df

FS-5531 --resolve add another optional param to supply flags for either behaviour n for null and b for boolean