master-qa-5101

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