* fixing bugs with DismissableSitenotice merge: