Persistent Networks documentation:Reviewed-By: Jessica Tomechak and Likitha Shetty
Docs: Fixed typo in nicira plugin guide
Merge branch '4.1' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into 4.1
CLOUDSTACK-1272: Fix incorrect annotation for service offering id

Fixes param annotation in:
   api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
   api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
   api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
maven: Fix stray characted in client/pom.xml introduced in 4572bc06

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
Summary: Adjust systemvm.iso path for KVM, due to packaging changes

Detail: Removing references to /usr/lib/cloud and /usr/lib64/cloud so that old
systemvm.iso files aren't found by accident. systemvm.iso should exist in
/usr/share/cloudstack-common/vms now.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360860243 -0700
CLOUDSTACK-1277: populating transit password field to UserVmJoinVO in
converting from UserVm to UserVmJoinVO.
CLOUDSTACK-1219, CLOUDSTACK-1220: Fix IPv6 error messages
Summary: centos63/package.sh, slightly better version parsing

Description: current package.sh fails if user hasn't downloaded all maven poms
prior to running package.sh. Now we match for something that vaguely resembles
a cloudstack version.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360889840 -0700
CLOUDSTACK-1137: force reconnect to a disconnected host throws error.
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>