BZ 790823 fix cancel redirect (cherry picked from commit a3d2dcb5fdd2c5e55eab867499ee18b02c94418b)
BZ 790823 fix cancel redirect
(cherry picked from commit a3d2dcb5fdd2c5e55eab867499ee18b02c94418b)

aeolusproject/conductor,aeolusproject/conductor,aeolusproject/conductor,aeolusproject/conductor