Availability on redeployment is added to NFRS
Trailing spaces are removed.
Merge remote branch 'fork/Issue-205'