fixed invalid handling of conditionally-assigned static final fields
Merge branch 'develop' of github.com:Sable/soot into develop