Merge pull request #1463 from jlipps/master

cache desired caps for use in mobile: reset
add more error handling in instruments_client