Updates to fix Protractor version and the Fix in step-4 for the test scenario.js

I hope this is correct, because I had to rebase all the steps to get this right and then move the git tags for the step.s