Allow move of master/slave resources if --master is present
Add ability to remove constraint rules