FELIX-1185 Apply state machine patch by Agemo Cui (thanks alot!)

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@781045 13f79535-47bb-0310-9956-ffa450edef68
7 files changed