Rebased onto trunk - fix conflicts

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java

@@ -574,6 +574,11 @@ public class ServiceScheduler extends CompositeService {
 
     }
 
+    @Override public void onContainerResourceUpdated(ContainerId containerId,
+        Resource resource) {
+
+    }
+
     @Override public void onGetContainerStatusError(ContainerId containerId,
         Throwable t) {
 
@@ -585,6 +590,12 @@ public class ServiceScheduler extends CompositeService {
 
     }
 
+    @Override
+    public void onUpdateContainerResourceError(ContainerId containerId,
+        Throwable t) {
+
+    }
+
     @Override
     public void onStopContainerError(ContainerId containerId, Throwable t) {