Merge pull request #724 from jlipps/master

make selendroid port configurable
fix test