Fix Error Canary38 (Doppio Ssrc)
Merge branch 'MarchUpdateTest' of https://github.com/GaijinKa/licode into MarchUpdateTest

Conflicts:
	erizo/src/erizo/media/ExternalOutput.cpp