Merge pull request #1603 from jlipps/master

refactor server/main and fix force-kill instruments issues
update selendroid to 0.7.0
changelog and bump to 0.12.3 for publish