PDIO-230 Refactor delete functions and improve error message
Merge branch 'develop' of github.com:PredictionIO/PredictionIO into develop