I've completed merges to 4.0 from master up to commit 95a60dc8bc7dbda2c83d48cb47ed77a765b984f8.
I did not include the following commits: dc07b2e3e616d6f945b8e85756c9f3a4f72b2fec - Brian Federle : There's a merge conflict and I don't understand java script enough to resolve it. Brian, please resolve it. 7e093a949d2445d320b1fba330ad802dc14db1b8 - Mice Xia: This change would change behavior of CloudStack. Please submit comments about what testing were done or if it doesn't change behavior, please comment on why. --Alex
