master-qa-5669

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