Revert "Modified SCardConnect/SCardDisconnect logic to prevent more than one card from being connected to a context.  Trying to connect more than once to a context without doing a disconnect can cause a deadlock in the pcsclite daemon (pcscd)."

This reverts commit ed8ea297e790fd0e26e1a04148a3e6de2ea46dca.
Merged changes from awakecoding/master
Fixed merge issue with smartcard_pcsc.c
Merge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding
xfreerdp: fix egfx SurfaceToSurface off-by-one
libfreerdp-codec: improve clear_decompress function parameters
libfreerdp-codec: improve ClearCodec decompressor
Merge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding
Merge branch 'awakecoding' of https://github.com/vworkspace/FreeRDP into awakecoding
Merge branch 'egfx' of https://github.com/awakecoding/FreeRDP into egfx
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
Merge branch 'master' of github.com:FreeRDP/FreeRDP into egfx
libfreerdp-codec: fix ClearCodec unit tests
Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx

Conflicts:
	libfreerdp/codec/test/TestFreeRDPCodecClear.c
libfreerdp-codec: add ClearCodec glyph cache
channels/rdpgfx: harden parsing code
libfreerdp-codec: more ClearCodec vBar caching
libfreerdp-codec: improve ClearCodec error checking
libfreerdp-codec: improve ClearCodec subcodec support
libfreerdp-codec: improve ClearCodec subcodec xStart, yStart handling