pull 299 code review changes
meaningless commit
:)
Merge pull request #303 from bkng/develop

pull 299 code review changes
Merge branch 'develop' into PLFM-1708
fixed time sensitive test
merged develop
Merge pull request #304 from john-hill/develop

removed time sensitive test check
finished firt part of PLFM-1708
Merge pull request #305 from john-hill/PLFM-1708

Plfm 1708