master-qa-5520

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