master-qa-5216

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