Merge branch 'master' into wip-nfs-ganesha

author Ramana Raja <ramanakrisna@gmail.com>

Fri, 16 Mar 2018 13:26:55 +0000 (18:56 +0530)

committer GitHub <noreply@github.com>

Fri, 16 Mar 2018 13:26:55 +0000 (18:56 +0530)
author Ramana Raja <ramanakrisna@gmail.com>
Fri, 16 Mar 2018 13:26:55 +0000 (18:56 +0530)
committer GitHub <noreply@github.com>
Fri, 16 Mar 2018 13:26:55 +0000 (18:56 +0530)
diff --cc nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
Simple merge
author	Ramana Raja <ramanakrisna@gmail.com>
	Fri, 16 Mar 2018 13:26:55 +0000 (18:56 +0530)
committer	GitHub <noreply@github.com>
	Fri, 16 Mar 2018 13:26:55 +0000 (18:56 +0530)