corrected scoping & activation of new shield & defense Effects

git-svn-id: https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk@5707 dbd5520b-6a0a-0410-a553-f54834df5b05
Merge remote-tracking branch 'svn-mirror/master'