fixes for FACES-1532

http://issues.liferay.com/browse/FACES-1532