master-qa-5218

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