Changed createEntity to return original entity and added null check for createInstructor
Update student method according to new createEntity
Merge branch 'master' into Issue2545
[2545] NPE in InstructorCourseAddAction