master-qa-6004

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