CRAFTERCMS-409: Improving the API supporting createOrUpdate subscription method
Merge remote-tracking branch 'alvaro/master'