master-qa-5506

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