Removing redundant if block
COOK-3156: fix incorrect grants.sql statement when root_network_acl specified
better create user statement that is idempotent
update the way to handle ipaddress attribute

http://tickets.opscode.com/browse/COOK-3134
Merge pull request #95 from mancdaz/master

COOK-3156: fix grants.sql statement when root_network_acl specified
Merge pull request #93 from pierreozoux/COOK-3134

update the way to handle ipaddress attribute
Merge pull request #57 from galstrom21/master

COOK-2318 - Removing redundant if block
Merge branch 'upstream' into jenkins-upstream-3
Merge pull request #3 from rackspace-cookbooks/jenkins-upstream-3

merges from mysql - upstream