Fix branch conflicts#17

mikeproeng37 merged 2 commits intodeveloptimizely/javascript-sdk:develfrom

mng/fix-branch-conflictsoptimizely/javascript-sdk:mng/fix-branch-conflictsCopy head branch name to clipboard