make "X" close button work + remove duplicated message for SimplePush variant addition

https://issues.jboss.org/browse/AGPUSH-946

https://issues.jboss.org/browse/AGPUSH-984

belongs to `master` and `1.0.x` branches