FACES-1925, FACES-1921, FACES-1714 revert accidental commit of alloy:popover