master-qa-5214

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