Merge pull request #1952 from scottyaslan/devBranch

[BACKLOG-290] Clean up extensions
[BACKLOG-195] Added back a removed parameter from SchedulerResource
Merge pull request #1954 from bmorrise/dev

[BACKLOG-195] Added back a removed parameter from SchedulerResource
[BACKLOG-735] UserConsoleResource
Merge pull request #1956 from mdamour1976/master

[BACKLOG-735] UserConsoleResource
[BACKLOG-503] Update LDAPResource oemdoc