Made minor changes in the names of some package contents.
Merge remote-tracking branch 'upstream/master'
fixed typo in sla documentation