fixed js merge issue
fixed js merge issue

Prashant-Surya/addons-server,ingenioustechie/zamboni,Witia1/olympia,ayushagrawal288/zamboni,johancz/olympia,magopian/olympia,mudithkr/zamboni,harry-7/addons-server,SuriyaaKudoIsc/olympia,luckylavish/zamboni,washort/zamboni,mozilla/addons-server,lavish205/olympia,kumar303/olympia,eviljeff/olympia,anaran/olympia,ingenioustechie/zamboni,psiinon/addons-server,Nolski/olympia,mozilla/olympia,jpetto/olympia,mrrrgn/olympia,Hitechverma/zamboni,kmaglione/olympia,yfdyh000/olympia,andymckay/addons-server,diox/olympia,elysium001/zamboni,crdoconnor/olympia,jpetto/olympia,anaran/olympia,harry-7/addons-server,Prashant-Surya/addons-server,mstriemer/olympia,clouserw/zamboni,wagnerand/zamboni,mstriemer/olympia,kumar303/addons-server,mozilla/zamboni,ddurst/zamboni,mozilla/addons-server,elysium001/zamboni,mdaif/olympia,magopian/olympia,jamesthechamp/zamboni,mstriemer/addons-server,Joergen/olympia,aviarypl/mozilla-l10n-addons-server,ddurst/zamboni,koehlermichael/olympia,Joergen/zamboni,Nolski/olympia,beni55/olympia,beni55/olympia,mdaif/olympia,crdoconnor/olympia,mstriemer/olympia,andymckay/addons-server,jasonthomas/zamboni,jamesthechamp/zamboni,atiqueahmedziad/addons-server,luckylavish/zamboni,Witia1/olympia,bqbn/addons-server,andymckay/olympia,wagnerand/zamboni,Joergen/zamboni,Nolski/olympia,jasonthomas/zamboni,Revanth47/addons-server,kmaglione/olympia,mozilla/addons-server,mozilla/olympia,tsl143/addons-server,muffinresearch/olympia,mudithkr/zamboni,Hitechverma/zamboni,elysium001/zamboni,harikishen/addons-server,kumar303/zamboni,kmaglione/olympia,psiinon/addons-server,andymckay/zamboni,mdaif/olympia,mozilla/addons-server,koehlermichael/olympia,mstriemer/zamboni,crdoconnor/olympia,atiqueahmedziad/addons-server,shahbaz17/zamboni,ddurst/zamboni,crdoconnor/olympia,Joergen/zamboni,elysium001/zamboni,diox/olympia,muffinresearch/addons-server,bqbn/addons-server,muffinresearch/addons-server,jpetto/olympia,yfdyh000/olympia,mudithkr/zamboni,spasovski/zamboni,SuriyaaKudoIsc/olympia,kumar303/addons-server,kumar303/addons-server,tsl143/addons-server,spasovski/zamboni,anaran/olympia,mozilla/olympia,yfdyh000/olympia,harry-7/addons-server,mrrrgn/olympia,washort/zamboni,jasonthomas/zamboni,Witia1/olympia,magopian/olympia,ingenioustechie/zamboni,spasovski/zamboni,koehlermichael/olympia,muffinresearch/olympia,andymckay/olympia,Revanth47/addons-server,koehlermichael/olympia,mdaif/olympia,lavish205/olympia,wagnerand/zamboni,wagnerand/olympia,johancz/olympia,washort/zamboni,Prashant-Surya/addons-server,yfdyh000/olympia,tsl143/addons-server,kumar303/olympia,mdaif/olympia,Jobava/zamboni,mstriemer/zamboni,jasonthomas/zamboni,muffinresearch/addons-server,beni55/olympia,luckylavish/zamboni,anaran/olympia,johancz/olympia,kmaglione/olympia,tsl143/zamboni,mstriemer/zamboni,diox/olympia,Joergen/olympia,clouserw/zamboni,psiinon/addons-server,spasovski/zamboni,diox/zamboni,Nolski/olympia,mstriemer/addons-server,ingenioustechie/zamboni,diox/zamboni,Revanth47/addons-server,kumar303/olympia,aviarypl/mozilla-l10n-addons-server,kmaglione/olympia,harry-7/addons-server,andymckay/addons-server,diox/zamboni,muffinresearch/olympia,aviarypl/mozilla-l10n-addons-server,robhudson/zamboni,ayushagrawal288/zamboni,harikishen/addons-server,muffinresearch/addons-server,atiqueahmedziad/addons-server,lavish205/olympia,ngokevin/zamboni,Jobava/zamboni,ddurst/zamboni,aviarypl/mozilla-l10n-addons-server,Revanth47/addons-server,mozilla/olympia,mstriemer/addons-server,Prashant-Surya/addons-server,Joergen/zamboni,Jobava/zamboni,kumar303/zamboni,tsl143/zamboni,robhudson/zamboni,mrrrgn/olympia,psiinon/addons-server,mozilla/zamboni,kumar303/zamboni,eviljeff/zamboni,kumar303/olympia,magopian/olympia,harikishen/addons-server,SuriyaaKudoIsc/olympia,mstriemer/olympia,Hitechverma/zamboni,mrrrgn/olympia,lavish205/olympia,ayushagrawal288/zamboni,johancz/olympia,wagnerand/olympia,shahbaz17/zamboni,Joergen/olympia,andymckay/zamboni,bqbn/addons-server,Witia1/olympia,jpetto/olympia,kumar303/addons-server,crdoconnor/olympia,eviljeff/olympia,eviljeff/olympia,Nolski/olympia,eviljeff/olympia,harikishen/addons-server,mstriemer/zamboni,Joergen/olympia,wagnerand/addons-server,atiqueahmedziad/addons-server,SuriyaaKudoIsc/olympia,robhudson/zamboni,eviljeff/zamboni,mstriemer/addons-server,tsl143/addons-server,mudithkr/zamboni,beni55/olympia,mozilla/zamboni,kumar303/zamboni,ngokevin/zamboni,wagnerand/olympia,bqbn/addons-server,eviljeff/zamboni,eviljeff/zamboni,ayushagrawal288/zamboni,andymckay/olympia,diox/zamboni,andymckay/zamboni,clouserw/zamboni,Joergen/zamboni,mozilla/zamboni,andymckay/addons-server,yfdyh000/olympia,andymckay/olympia,muffinresearch/olympia,johancz/olympia,luckylavish/zamboni,washort/zamboni,wagnerand/addons-server,shahbaz17/zamboni,muffinresearch/olympia,Hitechverma/zamboni,Jobava/zamboni,Joergen/olympia,beni55/olympia,jamesthechamp/zamboni,robhudson/zamboni,tsl143/zamboni,Joergen/zamboni,jamesthechamp/zamboni,shahbaz17/zamboni,wagnerand/addons-server,muffinresearch/addons-server,wagnerand/addons-server,tsl143/zamboni,koehlermichael/olympia,wagnerand/zamboni,Witia1/olympia,mrrrgn/olympia,diox/olympia,wagnerand/olympia,magopian/olympia,clouserw/zamboni,ngokevin/zamboni