Merge "Updated error catch for deleteRow ConfigurationServiceImpl.java"