FACES-2004 Improve Liferay Faces Showcase (fix compile failures due to backports)