Revert "Revert "Merge branch 'services-r8' into services-r9""

This reverts commit 409cd99e3a85566995fc0bbc541f70e01115b69d.

Change-Id: Iacd317820455695b924217a55fded5659e289cfb
Merge branch 'master' into services-r10

Conflicts:
	atmos/Gemfile.lock
	base/Gemfile.lock
	base/lib/base/provisioner.rb
	base/lib/base/version.rb
	filesystem/Gemfile.lock
	mongodb/Gemfile.lock
	mysql/Gemfile.lock
	neo4j/Gemfile.lock
	postgresql/Gemfile.lock
	redis/Gemfile.lock
	service_broker/Gemfile.lock

Change-Id: Iedc2e2ba29f714a581f8b84d44a4f87239113592
Merge branch 'services-r9' into services-r10

Change-Id: Ifd3d6f9435204825b635ce9f301c05fadb19ed37
make mongodb unit test pass even without dev_setup env

Change-Id: I4a722cbdbb79883bc4c82613cc7d7ffe936e37ad
fixed a bug in the service_broker unit test

case: when the directory for local_db does not exist, the unit test will return a failure
fix: added code to check whether the directory for local_db exists or not, create a directory
     if it does not exist.

Change-Id: Iacc0bdae3c564847e3793f9e3f636889a02e2683
Merge "fixed a bug in the service_broker unit test" into services-r10
Merge "make mongodb unit test pass even without dev_setup env" into services-r10
added the feature to auto generate spec report for ci

1. added spec report generation feature for ci for:
      atmos, base, filesystem, mongodb, mysql, neo4j,
      postgresql, rabbit, redis, serialization_data_server,
      service_broker, vblob

2. added a namespace called ci with task spec:
    for the new unit test with reports generated, do:
      bundle exec rake ci:spec
    the reports would sit in spec_report in the xml format, which can be recognized by jenkins.

Change-Id: Ic2ff8dd863dbb6bfe632929f8e9b556bb27bb53b
Update varz only when nats is enabled.

Change-Id: I508a6bb8a795030ac7589857120130f0b5451e8c
Fix max connection test failure on some machines

Change-Id: I37219c4f02993a03ae4d344b072761558630f3c1
Merge branch 'services-r9' into 'services-10'

Change-Id: I81650bc1a08ac431aeceb97b686df17486f78c4d
Each service node code need check datamapper object before destroy

Change-Id: Id5100305368b8d9525bc54914ebeab150c67dbfe
added coverage report generation feature for services

1. reconstruct the feature to create coverage report generation using
  SimpleCov for the following services:
  base, atmos, filesystem, mongodb, mysql, neo4j, postgresql, rabbit,
  redis, serialization_data_server, service_broker, vblob.

2. finished the unit test for using with the following rake command:
  bundle exec rake spec          # unit test without any report
  bundle exec rake spec:ci       # unit test with report for rcov and ci
  bundle exec rake spec:rcov     # unit test with report for rcov only

3. added corresponding gem to the vendor/cache/ mainly for simplecov.

Change-Id: I6a1cf069b38da65b5f5d4f3fc7ee6580ce7b587c
Merge "Each service node code need check datamapper object before destroy" into services-r10
Merge "added coverage report generation feature for services" into services-r10
correct column name in user query

Change-Id: Ib8ecd3f1ed11c5335d3f329b3a0c32cbf92dd019
Fix the bug that rabbit doesn't delete instance's logs when unprovision

Change-Id: I13d84574c712b84080a881305b00c65ba9175eea
Fix the redis warning: Could not cleanup instance, the reasons: ["ERR max number of clients reached"]

Change-Id: I2c9988c4337a42ca98409ca6a053985724cf6c5b
removed unused clover generator for coverage report for ci.

Change-Id: Ic1cc87da39406491ca6270533e8910a19970b6f1
Merge "correct column name in user query" into services-r10