master-qa-5971

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