KAZOO-1048: provide the proper service plans
KAZOO-929: Cleaned up rabbitmq-client test directory as a result of .gitignore rule.
Merge pull request #61 from 2600hz/KAZOO-929

KAZOO-929: Cleaned up rabbitmq-client test directory as a result of .git...
KAZOO-929: fix makefile recursion
Merge pull request #62 from 2600hz/KAZOO-929

KAZOO-929: fix makefile recursion
KAZOO-1165: Add pone_numbers/collection/activate api to allow to move number from account to account
KAZOO-1165: fix rebase issues
KAZOO-1165: do not charge for moving a number
Merge pull request #60 from 2600hz/KAZOO-1165

Kazoo 1165: Add pone_numbers/collection/activate api to allow to move number from account to account
HELP-5341: preserve rule order

Conflicts:
	whistle_apps/apps/callflow/src/module/cf_temporal_route.erl
HELP-5338: support networks where the hostname differs from the nodename

Conflicts:
	whistle_apps/apps/conference/src/conf_discovery.erl
	whistle_apps/src/whapps_call.erl
R14+ to R15+