As a follow-up to I71517146a197e39ed8ff2205e4234685d95331ad
this commit updates the conditional statements to explictly
indicate that the required state is true to improve
readability.
Additionally, revised lines related to DHCP templates to
multi-line format.
Change-Id: I919ef77a424266519a2590781284066c6f0f688b