merge with dev and fix conflicts

setup/automation/pm_standalone_defaults

@@ -34,6 +34,7 @@ HNMASTER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
 HNSENSOR=inherit
 HOSTNAME=standalone
 install_type=STANDALONE
+IP=192.168.0.0/16
 # LSINPUTBATCHCOUNT=
 # LSINPUTTHREADS=
 # LSPIPELINEBATCH=

setup/so-functions

@@ -1012,6 +1012,9 @@ parse_options() {
 
 			export {https,ftp,rsync,all}_proxy="$http_proxy"
 			;;
+		"--allow-analyst"|"--allow=a")
+			allow='a'
+			;;
 		*)
 			if  [[ $1 = --* ]]; then
 				echo "Invalid option"

setup/so-setup

@@ -541,6 +541,7 @@ fi
 success=$(tail -10 $setup_log | grep Failed | awk '{ print $2}')
 if [[ "$success" = 0 ]]; then
 	whiptail_setup_complete
+	if [[ -n $allow ]]; then so-allow -$allow; fi
 	if [[ $THEHIVE == 1 ]]; then
 		check_hive_init_then_reboot
 	else