CLOUDSTACK-1207. UpdateNetwork API fails with NPE if the network offering is not being updated and is non-persistent.
CLOUDSTACK-1295 : Added usage unit tests
Fixed Component annontation for usage parsers
Fixed mvn target to run usage
removed UsageServerComponentConfig which is not required
Added region_id to account table in cloud_usage db
Egress Firewall Rules Documentation
added db.properties to usage test resources
CLOUDSTACK-1253: Remove @author tag.
exclude usage unit test since it requires db connection
CLOUDSTACK-863: Fix Non-printable characters in api call

Non-printable characters results in empty pages for all users loading the
corrupted object in the web interface. It also results in the API call results
getting truncated with an error when it encounters the non-printable characters.
Every decoded parameter value is checked for control character using OWASP's
ESAPI library.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 87b668b71b34c93e9ba85d4708a1c04f4020f6bf)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
client: In pom.xml fix jetty:run to include utilities/scripts/db/ in its classpath

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 295b327281182c2767be57f8c3b75b8126452ea2)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
ApiServer: Get rid of finding system account and user at init() time

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 8094e933b08d830822dbdc711e5caad3c067b5d7)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
cloudstack-991

Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
CLOUDSTACK-1313

Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
Signed-off-by: Joe Brockmeier <jzb@zonker.net>
CLOUDSTACK-1320: listroutercmd: response should be set to the name of router

host name of router's resident host returned instead of the name of the
router. correcting the setter.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
db: Fix upgrade paths to 4.1.0

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit ca432fe6b7d006952bd0a7d85b94b988cf68c623)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
Adding legal documentation for the Java IPv6 library

Signed-off-by: Chip Childers <chip.childers@gmail.com>
Adding springsource artifacts to package legal docs.

Signed-off-by: Chip Childers <chip.childers@gmail.com>

Conflicts:

	tools/whisker/LICENSE
	tools/whisker/descriptor-for-packaging.xml

Also fixed the ordering for where we put java-ipv6.jar.
Add db upgrade path for ipv6
Summary: Increase tomcat servers memory size per dev list discussion

Detail: Per Kelven Yang when Javelin was merged into master/4.1, the memory
settings for management server should be a heap of 2g and a max perm size of
512m, due to increased footprint introduced by spring framework/Javelin.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361311099 -0700
Summary: Re-adjusting tomcat memory settings per Rohit's emails

Detail: adjusting MaxPerm to 800, Perm to 512.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361312885 -0700
CLOUDSTACK-1307 Noticed NPE when we put host in maintenance mode in clustered management setup

Changes:
   - Use of class variable of type GenericSearchBuilder causes issues when multiple threads invoke this method to findCapacity
   - Changing the scope of the variable to be local to these methods.
CLOUDSTACK-1330: ec2-run-instances - When -n option is used to deploy multiple Vms API returns error even though few of the Vms have been deployed successfully.

Changes:
- Instead of throwing out error, return the response containing the info about the instances that were launched.