1.2.2 Replace <> with != in logic added to labels

• Replace <> with != when adding branching logic and calc expression into element label. Labels get tags striped for pdf output so the <> chars were being removed.
• Include calc expression in annotated pdf