Merge branch 'review/matthew_mosesohn/bp/secure-fuel-master-services' into authx

Conflicts:
	docker/docker-astute.yaml

Change-Id: I2a9a526372bc36be0c070474f8aea7352036b64e
Merge branch 'authx' of https://github.com/loles/fuel-main into authx

Conflicts:
	docker/docker-astute.yaml

Change-Id: Ie3b46a6ed328efe45e352a621d51bcda9fb92c6f