master-qa-5521

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