Merge branch 'master' into dev/v0.7.0

# Conflicts:
#	devops/Jenkinsfile
#	devops/dockerfile/device-image/Dockerfile-Base
#	devops/dockerfile/model-inference-ingress/Dockerfile
#	devops/dockerfile/model-premise-master/Dockerfile
#	devops/dockerfile/model-premise-slave/Dockerfile
#	devops/k8s/README_MODEL_SERVING.md
#	devops/k8s/fedml-model-premise-master-latest.tgz
#	devops/k8s/fedml-model-premise-master/Chart.yaml
#	devops/k8s/fedml-model-premise-slave-latest.tgz
#	devops/k8s/fedml-model-premise-slave/Chart.yaml
#	devops/k8s/fedml-model-premise-slave/templates/deployment.yaml
#	devops/scripts/build-fedml-docker.sh
#	devops/scripts/build-inference.sh
#	devops/scripts/push-fedml-docker.sh
#	devops/scripts/setup-conda-env.sh
#	docker/arm64v8/Dockerfile
#	docker/build-docker.sh
#	docker/x86-64/Dockerfile
#	python/fedml/__init__.py
#	python/fedml/cli/comm_utils/sys_utils.py
#	python/fedml/core/mlops/mlops_runtime_log.py
#	python/fedml/core/security/attack/byzantine_attack.py
#	python/fedml/core/security/common/utils.py
#	python/fedml/fa/aggregator/k_percentile_element_aggregator.py
#	python/setup.py

Author: fedml-alex