master-qa-5298

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