master-qa-5698

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