diff --git a/oam/install_scripts/Makefile.am b/oam/install_scripts/Makefile.am
index f07c9cbbf..05c221c2f 100644
--- a/oam/install_scripts/Makefile.am
+++ b/oam/install_scripts/Makefile.am
@@ -26,7 +26,7 @@ remote_scp_put.sh columnstoreUninstall.sh columnstore.def \
 remotessh.exp rsync.sh remote_command_verify.sh \
 columnstore.conf columnstoreSyslog7 master-rep-columnstore.sh \
 slave-rep-columnstore.sh disable-rep-columnstore.sh \
-myCnf-include-args.text myCnf-exclude-args.text 
+myCnf-include-args.text myCnf-exclude-args.text columnstore.service 
 
 dist_local_DATA = module
 
diff --git a/oam/install_scripts/Makefile.in b/oam/install_scripts/Makefile.in
deleted file mode 100644
index 723423697..000000000
--- a/oam/install_scripts/Makefile.in
+++ /dev/null
@@ -1,512 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Copyright (C) 2014 InfiniDB, Inc.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; version 2 of
-# the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = oam/install_scripts
-DIST_COMMON = $(dist_local_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(localdir)"
-SCRIPTS = $(bin_SCRIPTS)
-SOURCES =
-DIST_SOURCES =
-DATA = $(dist_local_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POW_LIB = @POW_LIB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-etcdir = @etcdir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-idb_brm_libs = @idb_brm_libs@
-idb_cflags = @idb_cflags@
-idb_common_includes = @idb_common_includes@
-idb_common_ldflags = @idb_common_ldflags@
-idb_common_libs = @idb_common_libs@
-idb_cppflags = @idb_cppflags@
-idb_cxxflags = @idb_cxxflags@
-idb_exec_libs = @idb_exec_libs@
-idb_ldflags = @idb_ldflags@
-idb_oam_libs = @idb_oam_libs@
-idb_write_libs = @idb_write_libs@
-idbinstall = @idbinstall@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localdir = @localdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-march_flags = @march_flags@
-mibdir = @mibdir@
-mkdir_p = @mkdir_p@
-mysqldir = @mysqldir@
-netsnmp_libs = @netsnmp_libs@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-postdir = @postdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedir = @sharedir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-toolsdir = @toolsdir@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-bin_SCRIPTS = post-install pre-uninstall remote_command.sh \
-columnstoreLogRotate transactionLog transactionLogArchiver.sh \
-module_installer.sh startupTests.sh \
-user_installer.sh performance_installer.sh \
-remote_scp_get.sh columnstoreAlias run.sh upgrade-columnstore.sh \
-post-mysql-install post-mysqld-install binary_installer.sh \
-os_check.sh columnstore columnstoreSyslog columnstoreSyslog-ng syslogSetup.sh \
-remote_scp_put.sh columnstoreUninstall.sh columnstore.def \
-remotessh.exp rsync.sh remote_command_verify.sh \
-columnstore.conf columnstoreSyslog7 master-rep-columnstore.sh \
-slave-rep-columnstore.sh disable-rep-columnstore.sh \
-myCnf-include-args.text myCnf-exclude-args.text 
-
-dist_local_DATA = module
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu oam/install_scripts/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu oam/install_scripts/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binSCRIPTS: $(bin_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-binSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-dist_localDATA: $(dist_local_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(localdir)" || $(MKDIR_P) "$(DESTDIR)$(localdir)"
-	@list='$(dist_local_DATA)'; test -n "$(localdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(localdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(localdir)" || exit $$?; \
-	done
-
-uninstall-dist_localDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_local_DATA)'; test -n "$(localdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(localdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(localdir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS) $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(localdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dist_localDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binSCRIPTS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binSCRIPTS uninstall-dist_localDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binSCRIPTS install-data install-data-am \
-	install-dist_localDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-binSCRIPTS uninstall-dist_localDATA
-
-
-test:
-
-coverage:
-
-leakcheck:
-
-docs:
-
-bootstrap: install-data-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/oam/install_scripts/columnstore b/oam/install_scripts/columnstore
index 0467bcb36..211d24cd1 100644
--- a/oam/install_scripts/columnstore
+++ b/oam/install_scripts/columnstore
@@ -120,9 +120,8 @@ start() {
 stop() {
 	echo "Shutting down MariaDB Columnstore Database Platform"
 	touch /tmp/StopColumnstore
-	pkill -9 ProcMon
-	pkill -9 ProcMgr
-	pkill -9 snmptrapd
+	pkill ProcMon
+	pkill ProcMgr
 	sleep 1
 	$InstallDir/bin/clearShm
 	RETVAL=$?
diff --git a/oam/install_scripts/columnstore.service b/oam/install_scripts/columnstore.service
new file mode 100644
index 000000000..a38c8df2f
--- /dev/null
+++ b/oam/install_scripts/columnstore.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=MariaDB Columnstore
+After=network.target
+[Service]
+Type=forking
+#Restart=on-abnormal
+GuessMainPID=yes
+ExecStart=/usr/local/mariadb/columnstore/bin/columnstore start
+ExecStopPost=/usr/local/mariadb/columnstore/bin/columnstore stop
+TimeoutStopSec=5
+LimitNOFILE=65535
+[Install]
+WantedBy=multi-user.target
diff --git a/oam/install_scripts/configReport.sh b/oam/install_scripts/configReport.sh
new file mode 100755
index 000000000..b244bb272
--- /dev/null
+++ b/oam/install_scripts/configReport.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+#
+# $Id: hardwareReport.sh 421 2007-04-05 15:46:55Z dhill $
+#
+if [ $1 ] ; then
+        MODULE=$1
+else
+        MODULE="pm1"
+fi
+
+if [ $2 ] ; then
+        INSTALLDIR=$2
+else
+        INSTALLDIR="/usr/local/mariadb/columnstore"
+fi
+
+if [ $USER = "root" ]; then
+	SUDO=" "
+else
+	SUDO="sudo"
+fi
+
+$SUDO rm -f /tmp/${MODULE}_configReport.txt
+
+{
+echo " "
+echo "******************** Configuration/Status Report for ${MODULE} ********************"
+echo " "
+
+systemctl=`which systemctl 2>/dev/null`
+if [ -n "$systemctl" ]; then
+        echo "-- systemctl configuration --"
+        echo " "
+        echo "################# systemctl list-unit-files --type=service | grep columnstore #################"
+        echo " "
+        $SUDO systemctl list-unit-files --type=service | grep columnstore 2>/dev/null
+else
+  chkconfig=`which chkconfig 2>/dev/null`
+  if [ -n "$chkconfig" ]; then
+	echo "-- chkconfig configuration --"
+	echo " "
+	echo "################# chkconfig --list | grep columnstore #################"
+	echo " "
+	$SUDO chkconfig --list | grep columnstore 2>/dev/null
+  else
+    updaterc=`which update-rc.d 2>/dev/null`
+    if [ -n "$updaterc" ]; then
+	echo "-- services configuration --"
+	echo " "
+	echo "################# service --status-all | grep columnstore #################"
+	echo " "
+	$SUDO service --status-all | grep columnstore 2>/dev/null
+   fi
+ fi
+fi
+
+echo " "
+echo "-- fstab Configuration --"
+echo " "
+echo "################# cat /etc/fstab #################"
+echo " "
+$SUDO cat /etc/fstab 2>/dev/null
+
+echo " "
+echo "-- Server Processes --"
+echo " "
+echo "################# ps axu #################"
+echo " "
+$SUDO ps axu
+
+echo " "
+echo "-- Server Processes with resource usage --"
+echo " "
+echo "################# top -b -n 1 #################"
+echo " "
+$SUDO top -b -n 1
+
+} > /tmp/${MODULE}_configReport.txt
+
+exit 0
diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install
index 8698a583b..ebfc061f0 100755
--- a/oam/install_scripts/post-install
+++ b/oam/install_scripts/post-install
@@ -154,22 +154,22 @@ $installdir/bin/clearShm  > /dev/null 2>&1
 
 #setup the columnstore service script
 rm -f /etc/init.d/columnstore >/dev/null 2>&1
-#cp $installdir/bin/columnstore /etc/init.d >/dev/null 2>&1
-
-#check which system config to use
-cp $installdir/bin/columnstore /etc/init.d/. >/dev/null 2>&1
 
 systemctl=`which systemctl 2>/dev/null`
 if [ -n "$systemctl" ]; then
 
-	systemctl enable columnstore
+	chmod 644 $installdir/bin/columnstore.service
+	cp $installdir/bin/columnstore.service /usr/lib/systemd/system/. >/dev/null 2>&1
+	systemctl enable columnstore >/dev/null 2>&1
 else
 	chkconfig=`which chkconfig 2>/dev/null`
 	if [ -n "$chkconfig" ]; then
 
+		cp $installdir/bin/columnstore /etc/init.d/. >/dev/null 2>&1
 		chkconfig --add columnstore > /dev/null 2>&1
 		chkconfig columnstore on > /dev/null 2>&1
 	else
+		cp $installdir/bin/columnstore /etc/init.d/. >/dev/null 2>&1
 		updaterc=`which update-rc.d 2>/dev/null`
 		if [ -n "$updaterc" ]; then
 
diff --git a/oam/install_scripts/pre-uninstall b/oam/install_scripts/pre-uninstall
index 5704305ec..b48cf0e3a 100755
--- a/oam/install_scripts/pre-uninstall
+++ b/oam/install_scripts/pre-uninstall
@@ -82,7 +82,6 @@ rm -f /etc/logrotate.d/columnstore > /dev/null 2>&1
 rm -f /etc/cron.d/transactionLog > /dev/null 2>&1
 
 # delete Mariab Columnstore shared memory segments
-pkill -9 ProcMon
 $installdir/bin/clearShm  > /dev/null 2>&1
 
 # delete prat files
@@ -120,7 +119,6 @@ fi
 if [ -x $installdir/bin/syslogSetup.sh ]; then
 	if [ $user = "root" ]; then
 		$installdir/bin/syslogSetup.sh uninstall >/dev/null 2>&1
-		rm -f /etc/init.d/columnstore > /dev/null 2>&1
 	else
 		sudo $installdir/bin/syslogSetup.sh uninstall >/dev/null 2>&1
 	fi
@@ -130,18 +128,21 @@ fi
 systemctl=`which systemctl 2>/dev/null`
 if [ -n "$systemctl" ]; then
 
-	systemctl disable columnstore
+	systemctl disable columnstore >/dev/null 2>&1
+	rm -f /usr/lib/systemd/system/columnstore.service
 else
 	chkconfig=`which chkconfig 2>/dev/null`
 	if [ -n "$chkconfig" ]; then
 
 		chkconfig columnstore off > /dev/null 2>&1
 		chkconfig --del columnstore > /dev/null 2>&1
+		rm -f /etc/init.d/columnstore > /dev/null 2>&1
 	else
 		updaterc=`which update-rc.d 2>/dev/null`
 		if [ -n "$updaterc" ]; then
 
-			update-rc.d -f columnstore remove > /dev/null 2>&1	
+			update-rc.d -f columnstore remove > /dev/null 2>&1
+			rm -f /etc/init.d/columnstore > /dev/null 2>&1	
 		fi
 	fi
 fi
diff --git a/oam/install_scripts/softwareReport.sh b/oam/install_scripts/softwareReport.sh
new file mode 100755
index 000000000..f9c2dc340
--- /dev/null
+++ b/oam/install_scripts/softwareReport.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+#
+# $Id: hardwareReport.sh 421 2007-04-05 15:46:55Z dhill $
+#
+if [ $1 ] ; then
+        MODULE=$1
+else
+        MODULE="pm1"
+fi
+
+if [ $2 ] ; then
+        INSTALLDIR=$2
+else
+        INSTALLDIR="/usr/local/mariadb/columnstore"
+fi
+
+if [ $USER = "root" ]; then
+	SUDO=" "
+else
+	SUDO="sudo"
+fi
+
+$SUDO rm -f /tmp/${MODULE}_softwareReport.txt
+
+{
+echo " "
+echo "******************** Software Report for ${MODULE} ********************"
+echo " "
+
+echo " "
+echo "-- Columnstore Package Details --"
+echo " "
+echo "################# mcsadmin getcolumnstoresoftwareinfo #################"
+echo " "
+$INSTALLDIR/bin/mcsadmin getsoftwareinfo
+
+if [ -e $INSTALLDIR/releasenum ];then
+  echo " "
+  echo "-- Columnstore Release Number file --"
+  echo " "
+  echo "################# cat $INSTALLDIR/releasenum #################"
+  echo " "
+  cat $INSTALLDIR/releasenum
+fi
+
+echo " "
+echo "-- Columnstore Storage Configuration --"
+echo " "
+echo "################# mcsadmin getStorageConfig #################"
+echo " "
+$INSTALLDIR/bin/mcsadmin getStorageConfig
+
+} > /tmp/${MODULE}_softwareReport.txt
+
+exit 0