SRAMP-380 Passwords in clear text when running in Fuse 6.1
Fixed conflicts due to change in format of version properties.
Merge branch 'dvirgiln-master'