diff --git a/configure.ac b/configure.ac
index 9b88d5f6..22c3977c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,406 +1,406 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
 
 AC_INIT([fence-agents],
 	m4_esyscmd([make/git-version-gen .tarball-version]),
 	[developers@clusterlabs.org])
 
 AC_CONFIG_AUX_DIR([.])
 
 AM_INIT_AUTOMAKE([-Wno-portability dist-bzip2 dist-xz subdir-objects])
 
 LT_PREREQ([2.2.6])
 LT_INIT
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([lib/fencing.py.py])
 AC_CONFIG_HEADERS([make/clusterautoconfig.h])
 
 AC_CANONICAL_HOST
 AC_PROG_LIBTOOL
 
 AC_LANG([C])
 
 # Sanitize path
 
 if test "$prefix" = "NONE"; then
 	prefix="/usr"
 	if test "$localstatedir" = "\${prefix}/var"; then
 		localstatedir="/var"
 	fi
 	if test "$sysconfdir" = "\${prefix}/etc"; then
 		sysconfdir="/etc"
 	fi
 	if test "$libdir" = "\${exec_prefix}/lib"; then
 		if test -e /usr/lib64; then
 			libdir="/usr/lib64"
 		else
 			libdir="/usr/lib"
 		fi
 	fi
 fi
 
 case $exec_prefix in
   NONE)   exec_prefix=$prefix;;
   prefix) exec_prefix=$prefix;;
 esac
 
 # Checks for programs.
 
 # check stolen from gnulib/m4/gnu-make.m4
 if ! ${MAKE-make} --version /cannot/make/this >/dev/null 2>&1; then
 	AC_MSG_ERROR([you don't seem to have GNU make; it is required])
 fi
 
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_LN_S
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_AWK
 AC_PROG_CXX
 AC_PROG_RANLIB
 
 ## local helper functions
 
 # this function checks if CC support options passed as
 # args. Global CFLAGS are ignored during this test.
 cc_supports_flag() {
 	local CFLAGS="$@"
 	AC_MSG_CHECKING([whether $CC supports "$@"])
 	AC_COMPILE_IFELSE([int main(){return 0;}] ,
 			  [RC=0; AC_MSG_RESULT([yes])],
 			  [RC=1; AC_MSG_RESULT([no])])
 	return $RC
 }
 
 # this function tests if a library has a certain function
 # by using AC_CHECK_LIB but restores the original LIBS global
 # envvar. This is required to avoid libtool to link everything
 # with everything.
 check_lib_no_libs() {
 	AC_CHECK_LIB([$1], [$2],,
 		     [AC_MSG_ERROR([Unable to find $1 library])])
 	LIBS=$ac_check_lib_save_LIBS
 }
 
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h netdb.h stddef.h sys/socket.h sys/time.h syslog.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UINT32_T
 
 # Checks for library functions.
 AC_FUNC_FORK
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([alarm atexit bzero dup2 memmove memset select socket strcasecmp strchr strdup strerror strtol])
 
 # local options
 AC_ARG_ENABLE([debug],
 	[  --enable-debug          enable debug build. ],
 	[ default="no" ])
 
 AC_ARG_WITH([fenceagentslibdir],
 	[  --with-fenceagentslibdir=PATH
                           installation path for fence library. ],
 	[ FENCEAGENTSLIBDIR="$withval" ],
 	[ FENCEAGENTSLIBDIR="${datadir}/fence" ])
 
 AC_ARG_WITH([default-config-dir],
 	[  --with-default-config-dir=DIR
 			  cluster config directory. ],
 	[ DEFAULT_CONFIG_DIR="$withval" ],
 	[ DEFAULT_CONFIG_DIR="$sysconfdir/cluster" ])
 
 AC_ARG_WITH([default-config-file],
 	[  --with-default-config-file=FILE
 			  cluster config file. ],
 	[ DEFAULT_CONFIG_FILE="$withval" ],
 	[ DEFAULT_CONFIG_FILE="cluster.conf" ])
 
 AC_ARG_WITH([agents],
 	[  --with-agents=LIST
                           list of agents to build/ship (default: all). ],
 	[ AGENTS_LIST="$withval" ],
 	[ AGENTS_LIST="all" ])
 
 if test "x$AGENTS_LIST" = x; then
 	AC_ERROR([No agents selected])
 fi
 
 FENCE_KDUMP=0
 if echo "$AGENTS_LIST" | grep -q -E "all|kdump"; then
 	case "$host_os" in
 		*bsd*)
 			;;
 		*)
 			FENCE_KDUMP=1
 			;;
 	esac
 	AGENTS_LIST=$(echo "$AGENTS_LIST" | sed -E "s/kdump( |$)//")
 fi
 
 FENCE_MANUAL=0
 if echo "$AGENTS_LIST" | grep -q -E "all|manual"; then
 	FENCE_MANUAL=1
 	AGENTS_LIST=$(echo "$AGENTS_LIST" | sed -E "s/manual( |$)//")
 fi
 
 FENCE_MPATH=0
 if echo "$AGENTS_LIST" | grep -q -E "all|mpath"; then
 	FENCE_MPATH=1
 fi
 
 FENCE_SCSI=0
 if echo "$AGENTS_LIST" | grep -q -E "all|scsi"; then
 	FENCE_SCSI=1
 fi
 
 FENCE_ZVM=0
 if echo "$AGENTS_LIST" | grep -q -E "all|zvm( |$)"; then
 	FENCE_ZVM=1
 fi
 
 if test "x$AGENTS_LIST" != xall; then
 	for j in $AGENTS_LIST; do
 		if ! test -f agents/$j/fence_$j*.py; then
 			AC_ERROR([Agent $j does not exists])
 		fi
 		AGENTS_LIST=`echo "$AGENTS_LIST" | sed -E -e "s#$j([^_/]|$)#$j/fence_$j\1#g" -e "s#zvm/fence_zvm( |$)#zvm/fence_zvmip\1#g"`
 	done
 fi
 
 if test "x$AGENTS_LIST" = xall; then
-	AGENTS_LIST=`find $srcdir/agents -mindepth 2 -maxdepth 2 -name 'fence_*.py' -print0 | xargs -0 | sed -e 's#[^ ]*/agents/##g' -e 's#lib/[A-Za-z_.]* ##g' -e 's#nss_wrapper/[A-Za-z_.]* ##g' -e 's#autodetect/[A-Za-z_.]* ##g'`
+	AGENTS_LIST=`find $srcdir/agents -mindepth 2 -maxdepth 2 -name 'fence_*.py' -print0 | xargs -0 | sed -E -e 's#[^ ]*/agents/##g' -e 's#lib/[A-Za-z_.]*( |$)##g' -e 's#nss_wrapper/[A-Za-z_.]*( |$)##g' -e 's#autodetect/[A-Za-z_.]*( |$)##g'`
 fi
 
 XENAPILIB=0
 if echo "$AGENTS_LIST" | grep -q xenapi; then
 	XENAPILIB=1
 fi
 
 ## random vars
 
 LOGDIR=${localstatedir}/log/cluster
 CLUSTERVARRUN=${localstatedir}/run/cluster
 CLUSTERDATA=${datadir}/cluster
 
 AC_PATH_PROGS(XMLLINT, xmllint)
 AM_CONDITIONAL(BUILD_DOC, test "x$XMLLINT" != "x" )
 if test "x$XMLLINT" = "x"; then
    AC_MSG_WARN([xmllint not installed, unable to (re-)build manual pages])
    exit 1
 fi
 AC_SUBST(XMLLINT)
 
 AC_PATH_PROGS(XSLTPROC, xsltproc)
 AM_CONDITIONAL(BUILD_DOC, test "x$XSLTPROC" != "x" )
 if test "x$XSLTPROC" = "x"; then
    AC_MSG_WARN([xsltproc not installed, unable to (re-)build manual pages])
    exit 1
 fi
 AC_SUBST(XSLTPROC)
 
 dnl Ensure PYTHON is an absolute path
 AC_PATH_PROG([PYTHON], [$PYTHON])
 
 AM_PATH_PYTHON
 if test -z "$PYTHON"; then
     echo "*** Essential program python not found" 1>&2
     exit 1
 fi
 
 AC_PYTHON_MODULE(pexpect, 1)
 AC_PYTHON_MODULE(pycurl, 1)
 AC_PYTHON_MODULE(requests, 1)
 
 if echo "$AGENTS_LIST" | grep -q amt_ws; then
 	AC_PYTHON_MODULE(pywsman)
 	if test "x${HAVE_PYMOD_PYWSMAN}" != xyes; then
 		AGENTS_LIST=$(echo "$AGENTS_LIST" | sed -E "s#amt_ws/fence_amt_ws.py( |$)##")
 		AC_MSG_WARN("Not building fence_amt_ws")
 	fi
 fi
 if echo "$AGENTS_LIST" | grep -q aws; then
 	AC_PYTHON_MODULE(boto3)
 	if test "x${HAVE_PYMOD_BOTO3}" != xyes; then
 		AGENTS_LIST=$(echo "$AGENTS_LIST" | sed -E "s#aws/fence_aws.py( |$)##")
 		AC_MSG_WARN("Not building fence_aws")
 	fi
 fi
 if echo "$AGENTS_LIST" | grep -q -E "ovh|vmware_soap"; then
 	AC_PYTHON_MODULE(suds)
 	if test "x${HAVE_PYMOD_SUDS}" != xyes; then
 		AGENTS_LIST=$(echo "$AGENTS_LIST" | sed -E "s#(ovh/fence_ovh|vmware_soap/fence_vmware_soap).py( |$)##g")
 		AC_MSG_WARN("Not building fence_ovh and fence_vmware_soap")
 	fi
 fi
 if echo "$AGENTS_LIST" | grep -q gce; then
 	AC_PYTHON_MODULE(googleapiclient)
 	if test "x${HAVE_PYMOD_GOOGLEAPICLIENT}" != xyes; then
 		AGENTS_LIST=$(echo "$AGENTS_LIST" | sed -E "s#gce/fence_gce.py( |$)##")
 		AC_MSG_WARN("Not building fence_ovh and fence_gce")
 	fi
 fi
 
 if echo "$AGENTS_LIST" | grep -q openstack; then
         AC_PYTHON_MODULE(novaclient)
         AC_PYTHON_MODULE(keystoneauth1)
         AC_PYTHON_MODULE(keystoneclient)
         if test "x${HAVE_PYMOD_NOVACLIENT}" != xyes || \
            (test "x${HAVE_PYMOD_KEYSTONEAUTH1}" != xyes || \
            test "x${HAVE_PYMOD_KEYSTONECLIENT}" != xyes); then
                 AGENTS_LIST=$(echo "$AGENTS_LIST" | sed -E "s#openstack/fence_openstack.py( |$)##")
                 AC_MSG_WARN("Not building fence_openstack")
         fi
 fi
 
 ## path to 3rd-party binaries
 AC_PATH_PROG([IPMITOOL_PATH], [ipmitool], [/usr/bin/ipmitool])
 AC_PATH_PROG([OPENSTACK_PATH], [openstack], [/usr/bin/openstack])
 AC_PATH_PROG([AMTTOOL_PATH], [amttool], [/usr/bin/amttool])
 AC_PATH_PROG([GNUTLSCLI_PATH], [gnutlscli], [/usr/bin/gnutls-cli])
 AC_PATH_PROG([COROSYNC_CMAPCTL_PATH], [corosync-cmapctl], [/usr/sbin/corosync-cmapctl])
 AC_PATH_PROG([SG_PERSIST_PATH], [sg_persist], [/usr/bin/sg_persist])
 AC_PATH_PROG([SG_TURS_PATH], [sg_turs], [/usr/bin/sg_turs])
 AC_PATH_PROG([VGS_PATH], [vgs], [/usr/sbin/vgs])
 AC_PATH_PROG([SUDO_PATH], [sudo], [/usr/bin/sudo])
 AC_PATH_PROG([SSH_PATH], [ssh], [/usr/bin/ssh])
 AC_PATH_PROG([TELNET_PATH], [telnet], [/usr/bin/telnet])
 AC_PATH_PROG([MPATH_PATH], [mpathpersist], [/usr/sbin/mpathpersist])
 AC_PATH_PROG([SBD_PATH], [sbd], [/sbin/sbd])
 AC_PATH_PROG([SUDO_PATH], [sudo], [/usr/bin/sudo])
 AC_PATH_PROG([SNMPWALK_PATH], [snmpwalk], [/usr/bin/snmpwalk])
 AC_PATH_PROG([SNMPSET_PATH], [snmpset], [/usr/bin/snmpset])
 AC_PATH_PROG([SNMPGET_PATH], [snmpget], [/usr/bin/snmpget])
 AC_PATH_PROG([NOVA_PATH], [nova], [/usr/bin/nova])
 AC_PATH_PROG([POWERMAN_PATH], [powerman], [/usr/bin/powerman])
 
 AC_PATH_PROG([PING_CMD], [ping])
 AC_PATH_PROG([PING6_CMD], [ping6])
 AC_PATH_PROG([PING4_CMD], [ping4])
 
 if test "x${ac_cv_path_PING_CMD}" = x; then
 	# assume multicall-ping just not available in build-environment
 	PING_CMD="/bin/ping"
 	PING4_CMD="/bin/ping -4"
 	PING6_CMD="/bin/ping -6"
 elif test "x${ac_cv_path_PING6_CMD}" = x; then
 	# just IPv4
 	PING4_CMD="${ac_cv_path_PING_CMD}"
 elif test -L ${ac_cv_path_PING6_CMD}; then
 	# assume multicall-ping
 	PING4_CMD="${ac_cv_path_PING_CMD} -4"
 else
 	# ping is just IPv4
 	PING4_CMD="${ac_cv_path_PING_CMD}"
 fi
 
 
 ## do subst
 
 AC_SUBST([DEFAULT_CONFIG_DIR])
 AC_DEFINE_UNQUOTED([DEFAULT_CONFIG_DIR], "$(eval echo ${DEFAULT_CONFIG_DIR})",
 		   [Default config directory])
 
 AC_SUBST([DEFAULT_CONFIG_FILE])
 AC_DEFINE_UNQUOTED([DEFAULT_CONFIG_FILE], "$(eval echo ${DEFAULT_CONFIG_FILE})",
 		   [Default config file])
 
 AC_SUBST([LOGDIR])
 AC_DEFINE_UNQUOTED([LOGDIR], "$(eval echo ${LOGDIR})",
 		   [Default logging directory])
 
 AC_SUBST([CLUSTERVARRUN])
 AC_DEFINE_UNQUOTED([CLUSTERVARRUN], "$(eval echo ${CLUSTERVARRUN})",
 		   [Default cluster var/run directory])
 
 AC_SUBST([CLUSTERDATA])
 AC_SUBST([FENCEAGENTSLIBDIR])
 AC_SUBST([SNMPBIN])
 AC_SUBST([AGENTS_LIST])
 AM_CONDITIONAL(BUILD_FENCE_KDUMP, test $FENCE_KDUMP -eq 1)
 AM_CONDITIONAL(BUILD_FENCE_MANUAL, test $FENCE_MANUAL -eq 1)
 AM_CONDITIONAL(BUILD_FENCE_MPATH, test $FENCE_MPATH -eq 1)
 AM_CONDITIONAL(BUILD_FENCE_SCSI, test $FENCE_SCSI -eq 1)
 AM_CONDITIONAL(BUILD_FENCE_ZVM, test $FENCE_ZVM -eq 1)
 AM_CONDITIONAL(BUILD_XENAPILIB, test $XENAPILIB -eq 1)
 
 AC_SUBST([IPMITOOL_PATH])
 AC_SUBST([OPENSTACK_PATH])
 AC_SUBST([AMTTOOL_PATH])
 AC_SUBST([COROSYNC_CMAPCTL_PATH])
 AC_SUBST([SG_PERSIST_PATH])
 AC_SUBST([SG_TURS_PATH])
 AC_SUBST([VGS_PATH])
 AC_SUBST([POWERMAN_PATH])
 
 
 ## *FLAGS handling
 
 ENV_CFLAGS="$CFLAGS"
 ENV_CPPFLAGS="$CPPFLAGS"
 ENV_LDFLAGS="$LDFLAGS"
 
 # debug build stuff
 if test "x${enable_debug}" = xyes; then
 	AC_DEFINE_UNQUOTED([DEBUG], [1], [Compiling Debugging code])
 	OPT_CFLAGS="-O0"
 else
 	OPT_CFLAGS="-O2"
 fi
 
 # gdb flags
 if test "x${GCC}" = xyes; then
 	GDB_FLAGS="-ggdb3"
 else
 	GDB_FLAGS="-g"
 fi
 
 # extra warnings
 EXTRA_WARNINGS=""
 
 WARNLIST="
 	all
 	shadow
 	missing-prototypes
 	missing-declarations
 	strict-prototypes
 	declaration-after-statement
 	pointer-arith
 	write-strings
 	cast-align
 	bad-function-cast
 	missing-format-attribute
 	format=2
 	format-security
 	format-nonliteral
 	no-long-long
 	unsigned-char
 	gnu89-inline
 	no-strict-aliasing
 	"
 
 for j in $WARNLIST; do
 	if cc_supports_flag -W$j; then
 		EXTRA_WARNINGS="$EXTRA_WARNINGS -W$j";
 	fi
 done
 
 CFLAGS="$ENV_CFLAGS $OPT_CFLAGS $GDB_FLAGS \
 	$EXTRA_WARNINGS $WERROR_CFLAGS"
 CPPFLAGS="-I\$(top_builddir)/make -I\$(top_srcdir)/make -I. $ENV_CPPFLAGS"
 LDFLAGS="$ENV_LDFLAGS"
 
 
 AM_EXTRA_RECURSIVE_TARGETS([xml-check xml-upload])
 AC_CONFIG_FILES([Makefile
 		 agents/Makefile
 		 lib/Makefile
 		 doc/Makefile])
 
 AC_OUTPUT