changes in translating quantum rules to aces for SI case

Change-Id: Id4bbe812c459e50680ee3e61e519d2168f831ad9

changes in policy for rules conversion and comparison when SI in applied

Change-Id: Id2bb61bb76a37efd2450b640e879c60f60670b54
Merge "changes in translating quantum rules to aces for SI case" into R2.0