[2981] Changes as a result of review.
[2981] Minor changes as a result of review.
[2981] Corrected a typo made with the previous change.
[2981] Corrected errors in .spec files before merge with master