resolving merge conflicts
resolving merge conflicts

knappk/JTAF-ExtWebDriver,FINRAOS/JTAF-ExtWebDriver,mikeastarb/JTAF-ExtWebDriver,mikeastarb/JTAF-ExtWebDriver,FINRAOS/JTAF-ExtWebDriver,knappk/JTAF-ExtWebDriver