Allow type and environment propagation to handle null
Allow type and environment propagation to handle null

Change-Id: If16ea5222d04c10cd81e2777bf6f3d970a80de08

flabbergast-config/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast