bug #3300: Fix oneuser login for ruby 1.8.7
bug #3321: Update references to EC2_INSTANCE_TYPE
bug #3309: OpenNebula.systems support does not work with an empty issue list

(cherry picked from commit f495cdf488a9cc5cfb2e717af107fedd1d95146c)
bug #3318: Ebtables Vnet driver does not use PHYDEV

(cherry picked from commit e141bd27fc148bb1ccec6d24f44925d31d42c813)
bug #3314: Creating a vnet reservation with spaces in the name gives error

(cherry picked from commit f9299ea90004190dd98184092976848268563e39)
bug #3296: VNet wizard for 802.1Q driver always asks for PHYDEV

(cherry picked from commit 28714d0ecfcc4cebe627bebd85d167eca6a1c893)
bug #3316: In cloud view the button to create a new VM does not work after creating one VM

(cherry picked from commit 34b4d8836d9a20abd0d641d091a3727fc47cfa76)
bug #3294: hybrid tab not available in vcenter view in the template creation dialog

(cherry picked from commit 667faf9668a741a1ae94af8a185a4124f72234b7)
bug #3282: VM refresh hides the graphs

(cherry picked from commit e4d34aa8492e5449045d6ce6b74e96c45aeaddbe)
bug #3138: Role VMs fails if the role is in pending
bug #3136: Service VMs table refresh does not work
bug #3135: Service 'change cardinality' button does not disappear after it's clicked
bug #3285: VM/Service Templates are not refreshed
Bug #3297: Remove debug output

(cherry picked from commit 215079a8eacde1d27411bf91fcf0d8b4d469b29d)
bug #3295: install net-ldap < 0.9 with ruby 1.8.7

(cherry picked from commit 1355c28734bcab3d67a70df093bf68473d52c78a)
bug #3342: Quotas are not applied to users created through vdcadmin view

(cherry picked from commit 7c0e5b3a423850e2d61a37db2c9d2c97a4820775)
Bug #3348: Set hover_delay to 0

(cherry picked from commit 698907822fbd1ea90057669b57e6da1c4068104f)
Bug #3346: Show vCenter and Hybrid IPs in cloud view

(cherry picked from commit d80a53a4fdf482060d154664e3aa66b05c9c0a91)
bug #3351: Fix wrong method call. Thanks to Sebastiaan Smit
bug #3334: fix bug searching for templates in vcenter

(cherry picked from commit 55ec34a6243bf11f44a71d7f40b6e8bdaba9a297)