master-qa-3517

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