master-qa-5614

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