Don't make FileBased the default asset service yet.
Merge remote-tracking branch 'refs/remotes/AuroraDevelopers/master'