[BZ 1126410] Minor updates based on code review.

(cherry picked from commit d1a3621)
Signed-off-by: Jay Shaughnessy <jshaughn@redhat.com>

modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/workers/MigrationTable.java

@@ -1,8 +1,7 @@
 /*
  * RHQ Management Platform
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
+ * Copyright (C) 2005-2014 Red Hat, Inc.
+ * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,10 +13,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+
 package org.rhq.server.metrics.migrator.workers;
 
 import org.joda.time.Duration;

modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java

@@ -130,7 +130,7 @@ protected Iterable<AggregateNumericMetric> findAggregateMetrics(Bucket bucket, i
         String cql =
             "SELECT schedule_id, time, type, value " +
             "FROM " + MetricsTable.AGGREGATE + " " +
-            "WHERE schedule_id = ? AND bucket = ?" +
+            "WHERE schedule_id = ? AND bucket = ? " +
             "ORDER BY time, type";
         PreparedStatement statement = session.prepare(cql);
         BoundStatement boundStatement = statement.bind(scheduleId, bucket.toString());