integrate incomplete pickler

move xpStanzaErrorCondition into the body of xpErrorCondition because it
is meaningless by itself and rename xpErrorCondition to xpStanzaErrorCondition