master-qa-2846

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