Mising checkin of Service Factory file
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/test/UserManagementServiceTests.js