Making the builtin app backup path configurable
putting force-iphone after force-ipad so that further tests run.
Merge pull request #2146 from sebv/quick-test-fixes

Quick and dirty test fixes