Fix merge error (#372)
Fix merge error (#372)


cschnei3/forseti-security,forseti-security/forseti-security,thenenadx/forseti-security,thenenadx/forseti-security,forseti-security/forseti-security,thenenadx/forseti-security,forseti-security/forseti-security,cschnei3/forseti-security,forseti-security/forseti-security,cschnei3/forseti-security