master-qa-4856

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