master-qa-2881

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