master-qa-7638

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