Local properties
Merge branch 'master' of github.com:bcdev/sst-cci-toolbox

Conflicts:
	mms/src/main/config/mmsrq-config.properties