[t1174] some merge/rebase confusion resolved
[t1174] some merge/rebase confusion resolved

mbuttu/butter,BBGInnovate/butter,robinparadise/videoquizmaker,mbuttu/butter,robinparadise/videoquizmaker,mozilla/butter,mozilla/butter,mbuttu/butter,BBGInnovate/butter