master-qa-5972

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