Merging from R1.10

Modified add osd script to set weight properly instead of blindly
setting it to 1.0. Now it is calculated based on size of disk
relative to 1TB.
1TB disk   => weight 1.0
832GB disk => weight 0.81

Closes-Bug: #1372659

Conflicts:

	contrail/files/config-storage-add-osd.sh

Change-Id: Ic1ad9fdd68937b37fd646bce3310925ff2512088