[spark] Spark v2
aa
Merge remote-tracking branch 'origin/HUE-spark-v2' into HUE-spark-v2

Conflicts:
	apps/spark/src/spark/__init__.py
	apps/spark/src/spark/api.py
	apps/spark/src/spark/forms.py