master-qa-6254

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