master-qa-8400

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