removing unwanted values
Merge branch 'master' of https://github.com/udaraliyanage/privatePaas

Conflicts:
	stratos-installer/conf/setup.conf