Revert "CLOUDSTACK-7077. Quickly attaching multiple data disks to a VM fails."

This reverts commit a9b3ab089d6cb0bc1494e10b2be90292f4c79289.
CLOUDSTACK-7248. [VMware] Extract volume fails with an NPE.
Synchronize attach disk to VM on the VM object value instead of using a DB lock.
CLOUDSTACK-6323: Change getUser API arg to userapikey

By default the getUser API picks apikey arg from HTTP request to return the
User object with that api key. We use apikey in the request, so it would return
the same user calling the API. This commit uses the USER_API_KEY in the API
annotation instead.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 72e06b4d9b40c42d28cc148a331c9c5461a10f6e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
volume /usr was sized to small and ends up being 100% full on SSVMs and CVMs. By juggling some partman-auto numbers the space gets devided more evenly. After this patch /usr should be around 80% full. I've also reduced the swap space because this makes no sense on virtual instances.

Signed-off-by: Daan Hoogland <daan@onecht.net>
CLOUDSTACK-6360: Fix JDK paths in ubuntu packaging init scripts, don't use 1.6

Since we've agreed to use JDK/JRE 1.7, this enforces that for Ubuntu builds
- this fix remove usage of 1.6 paths in JDK_DIR for cloud-{agent, management, usage}.
- adds oracle jdk 1.7 path (in case a user is using that)
- adds mysql-connector-java path to CLASSPATH for usage server
- adds libmysql-java pkg dependency (tested and available for precise and trusty)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 96d6a2a03734ebbb9f41196d56c409d544a268ea)

Conflicts:
	packaging/debian/init/cloud-usage
Adds pessimistic logic to try the hard coded paths if Rajani's logic fails
ListStorageTagsCmd: Seif forgot to add license in 67ca255

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-7292: Fixed issue in test_deploy_vm_root_resize.py

Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
appliance: change the way we find git branch in build.sh

(cherry picked from commit 493c0a68d2332cb9275902128c28f926a909f4ed)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	tools/appliance/build.sh
git: don't let db-police hook fail for no changes in setup/db

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>