Merge remote-tracking branch 'upstream/one-3.8' into one-3.8
Merge branch 'one-3.8' of github.com:arax/one into one-3.8
bug #1966: Fix for wrong CDROM removing
Bug #1995: Look for vmx file
Merge branch 'one-3.8' of github.com:arax/one into one-3.8
Merge remote-tracking branch 'upstream/one-3.8' into one-3.8
bug #2037: Check if session cookie has been changed
bug #2037: Remove expiration time from server for user cookies
Merge remote-tracking branch 'upstream/one-3.8' into one-3.8
Merge branch 'one-3.8' of github.com:arax/one into one-3.8
bug #1917: Update user pool cache periodically. Disable the cache for those auth methods that does not need it

(cherry picked from commit 02a41ab34d3e863da5666fd80581ad76388a25b8)

Conflicts:
	src/cloud/common/CloudAuth.rb
bug #1861: fix password black out when authentication fails

(cherry picked from commit 138181ee3ce70289f4167c9617e88f17456007ba)
bug #1816 regionEndpoint with missing hostname in DescribeRegions, contributed by  Giovanni Toraldo

(cherry picked from commit a6c01c0a505da77e2a3b5f3c2b47f935f75ea170)
bug #1792: Add dl_vlan filter contributed by Oriol Marti

(cherry picked from commit 37e144a8a51ad6221e2d739addc885f301710d7f)
bug #1779: Handle error when the marketplace is not available

(cherry picked from commit f84c7d53d7d156e43e503f6e8f5f0b8df2c13bb1)
bug #1997: Fix --secret-key option in econe commands
(cherry picked from commit afcda7f7037398d1d01c8783b823443efc5a9f00)
bug #1997: Fix typo in ec2 image template
(cherry picked from commit acf91cf5367d1c6a73e2b62e58f82a0340e4b246)
bug #1983: Keep NETWORK_ADDRESS for Ranged Networks

(cherry picked from commit 62d3ac55b223344712b02361fc8cc02c5a82626b)

Conflicts:
	src/vnm/RangedLeases.cc
bug #1933: fix bug that deletes whole VM upon detach disk

(cherry picked from commit a6a35f6f695af95bac9c938e4635b817bf8b40d1)
bug #1933: Get the right system datastore

(cherry picked from commit 4ea3a20d154f1c5a925b8c746735cf87ddb8278f)