Revert "Bug 949730 - Investigate test_cleanup_scard unittest failure for breaking gaia ui tests"

This reverts commit f916c32b344bb66135c540a0f083454a3e6aab68.
Merge branch 'master' of https://github.com/mozilla-b2g/gaia