Correct scope of jaxb-marshaller in pace module to exclude it from Android builds
Fix Bug #199: Problem after cancellation of EAC

The protocol needs to be removed from the cardstate or else it will continue with the step it was cancelled at.