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)
bug #1933: Applied part of #2097
bug #1923: do not use rack settings in ozones server

(cherry picked from commit ed0f40f582767749f5df1f383a30e9649a6dd60e)
bug #1921: ssh and x509 login never expires

Patch by Jean-Philippe Garcia Ballester

(cherry picked from commit 3303fef5109fa96fa6347af626cdea3b1041024e)
bug #1918: Update regular expression to show keys in Openssl compatible form

(cherry picked from commit ac061ca6995500e0945a50aa0f579c43f265b730)
bug #1914: added auth lib files to client installation

(cherry picked from commit edd52c2467fb7778470b0b2f273ca9a30783ec79)

Conflicts:
	install.sh
bug #1914: fixed ssh_auth require in oneuser cmd

(cherry picked from commit e631dad69dc05bc6b90e732de5823cdb1baad269)
Bug #1867: Disable migration to the same host

(cherry picked from commit 7a4e3a4be07882f909a44e50a06cb4f7b3cfed4b)

Conflicts:
	src/rm/RequestManagerVirtualMachine.cc
Fix compilation for ruby > 1.9
bug #1813: Storage type for BODY columns is now MEDIUMTEXT (this is only relevant for MySQL DBs)

(cherry picked from commit b68a8b6c83bdc6afb88febfb5ce304e57c20dd7b)

Conflicts:
	src/nebula/Nebula.cc
	src/nebula/SystemDB.cc
	src/vnm/VirtualNetwork.cc
bug #1813: Include SystemDB files, now separated from nebula.cc implementation as in 4.x