missing OS_INSECURE related fixes
Adding a / before tokens strings to take care of cases when URL supplied doesnt have trailing /
Merge remote-tracking branch 'upstream/master'
Merge pull request #144 from smurugap/master

Missing commits for test parameterization