Merge pull request #126 from pranavparikh/master

Fixing caps.proxy, changing error msg in locator controller
preparing for v83
Merge remote-tracking branch 'upstream/master'
Fixing bug for proxy test always running on Firefox