Merge pull request #17650 from gitmai/bug-988264-CC-messagehandler-error-networkInterface

Bug 988264 cc messagehandler error network interface
r=salva
Conflicts:
	apps/costcontrol/js/message_handler.js