master-qa-5532

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