master-qa-4160

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