master-qa-4016

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