master-qa-5220

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