[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.