1) Merged changes from 'jeffhand/methodnotallowed' into daravind/MetricsService-D17
2) Also, updated existing functional test to reflect changes