fix incorrect merge for pull request #444
fix incorrect merge for pull request #444

Conflicts:
	lib/connectors/hybrid/switcher.js

I don't know why pr #444 is lost, but so it is.

Change-Id: I7a154662a1e0a916f05a800f6a5d10eddc815b92

zhukaixy/pomelo,blueseason/pomelo,baegjins/pomelo,tomdev2008/pomelo,fabiobc/pomelo,cosmosbox/pomelo,zxc122333/pomelo,fabiobc/pomelo,beni55/pomelo,zxc122333/pomelo,baongoccarrot/pomelo,LosingLin/pomelo,bobcui/pomelo,jokerCode/pomelo,onelei/pomelo,sumrac69/pomelo,rain1017/pomelo,bobcui/pomelo,microlv/pomelo,skyblue/pomelo,jqk6/pomelo,chianquan/pomelo,oceanjack/pomelo,ljhsai/pomelo,cynron/pomelo,WeBest/pomelo,samlin08/pomelo,laiqiqi886/pomelo,chianquan/pomelo,chenhaooo/pomelo,cosmosbox/pomelo,hello2009chen/pomelo,leopoldfreeman/pomelo,tomdev2008/pomelo,lntitbk/pomelo,hzruandd/pomelo,microlv/pomelo,baongoccarrot/pomelo,MQQiang/pomelo,youprofit/pomelo,kkkkyue/pomelo,cynron/pomelo,silverera/pomelo_fix,hello2009chen/pomelo,fabiobc/pomelo,baegjins/pomelo,sumrac69/pomelo,wangchuan3533/pomelo,cynron/pomelo,onelei/pomelo,Suninus/pomelo,LosingLin/pomelo,onelei/pomelo,youprofit/pomelo,hzruandd/pomelo,sumrac69/pomelo,leopoldfreeman/pomelo,oceanjack/pomelo,jokerCode/pomelo,beni55/pomelo,kkkkyue/pomelo,zxc122333/pomelo,skyblue/pomelo,bobcui/pomelo,MetSystem/pomelo,jokerCode/pomelo,chenhaooo/pomelo,saruno/pomelo,silverera/pomelo_fix,blueseason/pomelo,IssicLzx/pomelo,baidao/pomelo,rain1017/pomelo,wangchuan3533/pomelo,NetEase/pomelo,MetSystem/pomelo,NetEase/pomelo,skyblue/pomelo,MQQiang/pomelo,blueseason/pomelo,LosingLin/pomelo,inetufo/pomelo_fix,ljhsai/pomelo,Suninus/pomelo,baegjins/pomelo,baidao/pomelo,NetEase/pomelo,WeBest/pomelo,baongoccarrot/pomelo,hzruandd/pomelo,inetufo/pomelo_fix,tomdev2008/pomelo,PortNumber53/pomelo,IssicLzx/pomelo,wangchuan3533/pomelo,laiqiqi886/pomelo,chianquan/pomelo,baidao/pomelo,youprofit/pomelo,saruno/pomelo,hello2009chen/pomelo,zhukaixy/pomelo,lntitbk/pomelo,Suninus/pomelo,saruno/pomelo,laiqiqi886/pomelo,zhukaixy/pomelo,lntitbk/pomelo,inetufo/pomelo_fix,leopoldfreeman/pomelo,PortNumber53/pomelo,MQQiang/pomelo,samlin08/pomelo,cosmosbox/pomelo,PortNumber53/pomelo,kkkkyue/pomelo,MetSystem/pomelo,silverera/pomelo_fix,jqk6/pomelo,rain1017/pomelo,samlin08/pomelo,oceanjack/pomelo,ljhsai/pomelo,IssicLzx/pomelo,WeBest/pomelo,microlv/pomelo,chenhaooo/pomelo,beni55/pomelo,jqk6/pomelo