Updating LICENSE AND NOTICE

LICENSE

@@ -207,38 +207,6 @@ Within the console-proxy/js directory
  from John Resig 
  jquery.js 
 
-Within the deps directory
- licensed under the BSD (2-clause) for XenServerJava http:https://www.opensource.org/licenses/BSD-2-Clause (as follows)
-
- Copyright (c) Citrix Systems, Inc.
- All rights reserved. 
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1) Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2) Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- from Citrix Systems, Inc http:https://www.citrix.com/ 
- XenServerJava from http:https://community.citrix.com/cdn/xs/sdks/
 
 Within the patches/systemvm/debian/config/etc directory
  placed in the public domain

NOTICE

@@ -1,4 +1,5 @@
-
+Apache CloudStack
+Copyright 2014 The Apache Software Foundation
 
  This product includes software developed at
  The Apache Software Foundation (http:https://www.apache.org/).