master-qa-4954

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