master-qa-5711

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