Another test for #26 and a fix (at least for the problems with the new test)

Avoid NPE if there is no xmlElementOriginalAnnotation use fieldName and
namespace of candidate instead

(These changes have been commited before but something went wrong)
Merge pull request #31 from kermit-the-frog/upstream

Another test for issue #26 and a fix (closes #31).