Code review changes
Merge pull request #326 from dburdick/develop

Code review changes for PLFM-1757
merged conflits