Changing host password to retrieve from testdata
Revert "server: Add event bus bean as commented xml in META-INF core"

Breaks CloudStack startup. You're better off putting this on the wiki

This reverts commit c730bc3491f8b684c5ae51e0bff54cf7577cc246.
Update gitignores for some new eclipse generated files
CLOUDSTACK-7316: Usage Server is not getting started when we install it on management server. This is happening when encryption is enabled. For usage server it is not able to get key file in the classpath.
CLOUDSTACK-7463: UI: Domain Admin UI shows 'Add LDAP Users' button (should not be shown)

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
CLOUDSTACK-7467 (this part of the ticket is related to augmenting an error message)
CLOUDSTACK-7467 Fix TestVolumes.test_07_resize_fail

Previously if you had a volume using a non customisable disk offering, and
attempted to resize it passing in the same disk offering id, the command would
be accepted, but it would actually be resized to its current size (i.e. the
provided size parameter was ignored). This is what the test used to check.

Commit de6a3112b6b80952d1598acaa112ac50a3ef9d32 modified the logic to check if
the provided diskofferingid was the same as the current one, and if so treat it
as if it hadn't been provided - this means the resize command now fails, which
is probably the more sensible thing to do (rather than giving the impression it
will be resized but actually not doing so).

This change therefore modifies the test logic to match.

Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
CLOUDSTACK-6694: WIP: Add front-end for internal LB subselect
CLOUDSTACK-7471:Regular user is allowed to deleteNetwork/RestartNetwork
that does not belong to him.He is also able to deploy Vm for other
users.
Fix incorrectly written unit tests.
CLOUDSTACK-7441: Fixed tempalte register issue in test_resource_limits.py

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
CLOUDSTACK-7228 Only shrink disk when CLVM is in use.

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
Improve the handling of the findbug exclude files
CLOUDSTACK-7468: Fixed the NetScaler SSL Termination behavior with Projects

Signed-off-by: Will Stevens <wstevens@cloudops.com>
CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in
VolumeDataStoreVO.
CLOUDSTACK-7480: UI > instance page > change "XenServer Tools Version 6.1+ field" to "Original XS Version is 6.1+" because what the field really presents is the original XenServer version when a VM is initially created.
if VM scale is disable, don't set any scale option for VM
CLOUDSTACK-7483: UI > instance page, template page > hide "Original XS Version is 6.1+" field when OS Type is not Windows since property jsonObj.details.hypervisortoolsversion only applies to Windows.
CLOUDSTACK-7483: UI > instance page, template page > hide "Original XS Version is 6.1+" field when OS Type is not Windows since property jsonObj.details.hypervisortoolsversion only applies to Windows - case sensitive when comparing OS Type.
Adding support for SolidFire snapshots