Fix for when there is no $post on the page in shortcode

This is a direct follow-up to #2215 and fixes an additional $post->ID use.
Merge pull request #2471 from sc0ttkclark/patch-1

Fix for when there is no $post on the page in shortcode
Remove urlencode_deep()
Make country code for Maldives uppercase
Merge pull request #2484 from elliott-stocks/patch-3

Make country code for Maldives uppercase
Change span class for edd_cart_subtotal

The other spans are appended with "_amount" to make it easier to target the values.
Merge pull request #2488 from elliott-stocks/patch-4

Change span class for edd_cart_subtotal
Merge branch 'master' into release/2.1
adjust subtotal span class
Merge branch 'release/2.1' of github.com:easydigitaldownloads/Easy-Digital-Downloads into release/2.1
Add filter to edd_is_free_download(). #2440