combine properties file

since all the props are set by helm there is no need for seperate
parameters. This has the benefit of allowing global properties to use
global injected (and vice versa) inside the property file

Issue-ID: TEST-184
Change-Id: Ic011aa9173a6073a1c389b6d1ceef6235c4e40a1
Signed-off-by: DR695H <dr695h@att.com>
6 files changed