Merge pull request #1950 from scottyaslan/devBranch

[BACKLOG-290] Clean up extensions
[BACKLOG-195] Updated oemdocs for ScheduleResource
Merge pull request #1951 from bmorrise/dev

[BACKLOG-195] Updated oemdocs for ScheduleResource
[BACKLOG-290] Clean up extensions