master-qa-5332

http://issues.liferay.com/browse/LIFERAYQA-5333