master-qa-4635

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