master-qa-5298

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